fix for ESBJAVA-3295