Java 8 Fix