Fix Java1.7 + MCP bug