fix for ESBJAVA-3099