Issue #208 fixing spaces