Fixes https://github.com/turt2live/matrix-dimension/issues/244
Fixes https://github.com/turt2live/matrix-dimension/issues/153