New line/space issue fixed