moved carriage return fix to higher up