fix ChoiceType::TYPE_CONTAINS