Dao bugFix