final hotfix portion