Patch fix.go to disable grouping