fixed mapping issue