Fixed switching between queue and stream