[HOTFIX] Fixing Viper leftover