After fixing database