Issue #84, removed spaces