Fix for TC investigation