better handling ESC hit