- [matrix] Addressing issue #75.