Switched to Java 1.8