TDI-29925 : additional fix for the set as repeatable