Change from distinct to group by to please Travis