Fixing ESBJAVA-3132.