functions hotfix