Remove circular triggering of set