Fix issue with whitespace trimming