Hotfix changes