Fixing cycling when there were duplicates in values getter