Correct mapping of matched parts