#4 Fix toggler