Issue #263 Fixing spaces