Fixed switch on\off updating