Fixing ESBJAVA-3183.