Try to fix JDK8