fix NVAS, NED.  NVAS requires an awful re hack