Fix for updated MCP