Fixed DDC-2235.
Merge pull request #758 from doctrine/DDC-2235

Fixed DDC-2235.