mcp mapping fix