Enhance compatibility (tested with activemq)