Resolve Matching Issues ()