Fixed db issue 2