Hack to fix the new line whitespace issue