Another fix for TT