hotfix changes