Issue #246 removing extra spaces