adjust for java8