Fixed bug on DAO