fix for ESBJAVA-3218