Another attempt to fix TT check