Resync better on broken streams