(Bug 5206) Put space where it really belongs