Java8 fix