Fix issue with new mongoDB ODM