wip : group matrix fix