Fix for DB access saving