Fix GLASSFISH-20994