fix for ESBJAVA-3282