Hotfix on stable