final db fix, I think