Fix Surcharge Plugin