Fixing stream management