fixed toggle issue