Partial bugfix: avoid multiplying stride many times