Better common factor matching