Fixed for Symfony2.3 support, tests pass