Nasty Hack to keep the TS on, just a test ATM

Thanks @simonsickle for helping me