Fix a bug where CR was not removed and caused a bunch of display issues.