reverted the previous commit, both calls are needed in TS mode