txm refactor
bug fix