fix all DAO