escaped fixes