Merge pull request #22 from 30x/XAPID-924

Fix TC regression