[DF-2706] fix for unique state set