Adding hotfix function.