Better isFinished handling