Re-fixed weird issue with additional newlines