ENYO-2449: reduce code overkill
ENYO-2449: avoid a loop error case