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

FIx TC break.