Keep embedded relations even with custom relations

Fix issue #122