fix Dao Bugs v.1