Fixed toggling weirdness