Hotfix on GA