Tb hs fix

I think this one should do it. Let me know if it messed up. Soon I will be a 'git'-fu master.