hot fix on group by