fixup regex for white space handling