ODM to Core object mode mapper bug fix again