fix for ESBJAVA-2987