Fixed problem with ChoiceDriver.