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

Thanks @simonsickle for helping me
Nasty hack #2

Still thanks to @simonsickle