fixed re-matching