Fix java8