Fixing some issues with repeated submodels