trace: ensure correct grouping