Fixed group by expression bug