Fix for ESBJAVA-3099