Add a isFinished flag