Fixed ModelChoiceIterator length

Fixes #18829