Fix change event not properly called