Fix for TC-807