Fix one more mapping issue