Trying to fix empty db issue