Fixed cdb_driver