Fix change event not firing

- [ ] @aintaer