removed group by to fix #28