Set within a list fixes