Improved a bit on a problem with some newlines.