Fix CR mapping