Fix escape bug