adjust for Java8