Fixed problem with too many change events from choice module