trying to fix java8 issues