Fixed bug in fallback code for model enumeration