Db class fix