fix to adapt the db changes