Fix server side streaming