[fix] back to the ugly stream hack