fix for ESBJAVA-3246