Fix for TC-885