Double-fire change event fix