Fix for type inference with OpenJDK build 1.8.0_20-ea-b23