Fix change event not firing

- [x] @aintaer