Fixing problem with Matching IDs