Bug fix 1
Database fix