fix model mapping issue