Fixed DB issue