Fix for TC-805