Hotfix done