Fix for ESBJAVA-3191