Auto-generated match fix