Attempt to fix matching, still broken