revert removal of space handling, different fix for avoiding option prefix
matches
1 file changed