Database Fix — David