fix for ESBJAVA-3258