Modeling hotfix