bug fixing for Dao