fixed toggle issues