Fix panic crash + chapter ordering in progress