fix some matrix/state token indexing bugs (see bug 10848)
1 file changed