Stream selector fix

@OrenMe  dont we want to send the stream that we're changing to?