Fixes issue #806

Replaces uses of wrong usages of `#asSet` where order is important