Fix ordered by Set