Fixed more problems with escaping