- Fix errors by restart and statistics