really really fix the stupid streaming thing