fix for ESBJAVA-3397