DatabaseAdapter fixed