Fix GroupBy return issue