Fixed DDC-1884.
CS fixes.
Merge pull request #741 from doctrine/DDC-1884

Fixed DDC-1884.