fix issue with stream/group flipped in operation