some fixe on TSmap