fix for ESBJAVA-3286