Fixed ModelChoiceIterator length