Changed list to set containing references
Merge branch 'hotfix/fix_possible_reference_issue'