Added workaround for JDK8u11 and 7u65 issues