Another TH bug workaround attempt