Fix #1201 by letting more accurate matches replace previous ones