Fix toggle regression