Fix bug with escaping