Fix issue with AbstractEntityManager