fix for ESBJAVA-3460