Fixed the set being overwritten