Fixing issue with the latest JDK