re #9420  matrix ws working, needs unit test