defend against any possible negative spaceleft
Merge branch 'trailing-space'
rebuild