fixed toggle behavior