Fix grouping so that works for different methods