Fixed when database is empty