Fixing for JDK8