Java 8 fix