Attempt to address GLASSFISH-21022 and GLASSFISH-20886