Merge "fix database bug"