WIP: watchGroup fix