Fixed TP Problems. :dancer: