fixed when_set no longer worked