Fixed edge case for multiple restart