Fixed whitespace parsing