fix for ESBJAVA-3006