Fix for TC-813