#732 Don't add spaces where not needed