CLSN-1694 matrix issues