fix for #8395 

this PR addresses #8395 and is a 2nd attempt.  I refactored my fix based on feedback from @peterflynn and @redmunds in #8426
I am not sure I see a *concrete* use case, so you're probably right, we should probably just leave the whitespace alone... very socialist, and I am Canadian, so this meshes well with me ;)