Fix toggle to accept options