Fix an issue with multiple group by columns