fixes as requested

this replaces #9534
Delete extra space