Fixed issue with escaping