Proper Java1.7 +MCP fix!