Trying to fix empty db issue 2