Fixed error in location matching code, does not seem to solve more includes but should reduce size of unresolved sets in some cases