dynamic TS fix