Gaps of more than one space are now properly handled.