Fixing race on Reset / Grouping Handler