Try a fix for #435
Merge pull request #464 from doctrine/fix/435

Try a fix for #435