Adding hotfix