Fix and details

The first commit show you how it should be done if the doctrine havn't a bug.
And the rest show you how to perform with the current version.