Hello team! This is an attempt to fix bug JDK-8230664. Please, could you review it? PR: https://github.com/openjdk/jdk/pull/358 Bug: https://bugs.openjdk.java.net/browse/JDK-8230664 Thank you very much, Jose R Ziviani