Better space escaping. Issue #2