Handle ended runs properly