better clear on change