Matching logic issues still happening.