Fixed bug on DAO (again)