Add :stop calls to group_by