toggling fixes