Hotfix addition