fix for ESBJAVA-3107