BugFix on Static TS