Fix to E-Surge (cleanup)