Fix for TC-830