VID-1976 fixing toggler bug