Fixed for latest Doctrine version