bug fixed toggle