fix for ESBJAVA-3260