Fix: choice toggle