And now fix the build for all other JDKs :-)