Fixed issue with trailing whitespace