More aggressive stopping to help with bad streams