5.7 surge

Did anyone ever come up with the remedy for the surge problem? This is a 98 5.7. After engine gets up to temperature and you stop at a stop light, foot on the brake and it's goes through the surge routine. RPM's will flucuate between 500 - 700 rpm. This is really aggravating. Other than that, it runs great. Any help or remedy will be appreciated.