Fixes #68

Also fixes if single result for other groups