Fix CR code