Doctrine fix