Add short-circuit for rotation-less matrix