fixing & escape