Bugfix TST extended