Fix for TC-904