Fixed CR (again)