Fix nested mapping issue