Bug fix for CR/LF