fix of 10079
Merge branch 'bugr10079' of https://github.com/dev4tc/tc-api