fix match entry ordering bug