fix for the "Lord Freud 6 issue; better whitespace handling