fix tdm
Merge branch 'xstools'