Fixing ESBJAVA-3327.