Hack to workaround \r\n issues