Fix for TC-985