Fix stream separation for 8x8