#420 - Static plugin repair.