Fix bug with escaping space