fix more escape