Fixed DB again