Fix diagonal streams ending up on adjacent streams.