Move to JDK 8 - fix