Make switch on/off work again