another attempt to fix the toggle