Fixes streaming :bug: