another fixup of input parsing