Fix ORM patches
Merge pull request #696 from romainneutron/orm-patches

Fix ORM patches