Cleanup
Fix for multiple streams at the same time. Needed for npm.