ModelRepo buildSingleModel fix