ENYO-2402:  fix regression linked to ENYO-2562