Fix carriage return issue