MCP bug fixing