Fix DDC-2579

http://www.doctrine-project.org/jira/browse/DDC-2579