Remove infinite loop
Update StreamController