Issue #96 removed spaces again