Fix for GLASSFISH-21242

Merge Simple Fix for GLASSFISH-21242