fixes toggle issues