cr mapping fix