Kill switch fix