Fix for GLASSFISH-21242