Solve db issue