Fix for new MCP mappings in forge 1251