Fixed a DB issue