#481 Fix extra spaces