NOBUG: fix bad handlign of whitespace