Fix problem in DAO
Merge origin/master