fix escaption issues