Finish fixing Postgres group by bug!