PLS FIX TP BUG