fix for ESBJAVA-3249