Stream selector fix