Fix TPC
(cherry picked from commit 6c0aed45e4715f49e054a7fa609c044d0a04dfbc)