Fix java 8 compile (was broken again in last commit)