fix for ESBJAVA-3172