Fixed escape (hopefully)