Fix mapping on object