CRLF and quotes bug fixed