Fixed whitespace handling