[Misc] Fix TPC (previous commit was not correct)