Rearranged the correct matches