mapping issue solved