Fixed ChoiceField-with-empty issue