Fixes https://github.com/turt2live/matrix-dimension/issues/287
Fixes https://github.com/turt2live/matrix-dimension/issues/165