Fix for TC-944