Fix the non mapping issue