* Fixing ESBJAVA-3076.