Bugfix: more CRLF issues