bug fixing DAO