KRACOEUS-7719 : fixing bugs related to equals comparison