Fix dao behaviour