Better harmonic mitigation