IDPSingletonModel hotfix