Fixing issues with new line character