fix viper stuff