Fix jdk 1.8 build (seems to be strict on tags)