Fix matches ordering