adding fix for ESBJAVA-3184