Make sure isFinished is always set