Trying to get around JDK bug for #916