Similar fix from wNetty41 (Set)