Fixing issue with rogue change events;