Fix TPCMaster