Fix match order