Database backend fix