StreamController fix