PIM-2441: Fix issue on ORM implementation