fix for ESBJAVA-3057