Fix for the generic DAO