Fixed DB problem