handle latest TS properly