Fix CP/I/D/R