DatabaseProvider fix