Making it work with both TH2.8 and TH2.9
merge