Fixed 'new line' issues