Fix for TC-814