Eng 3291 groupby fixup