Fix #2976 Do not add multiple models with same `id`
Merge pull request #2986 from caseywebdev/gh-2976

Fix #2976 Do not add multiple models with same `id`