Ref #103: enhancement for small matrix dimensions