Fix with database

Hopefully, the last.