Update. Still a bug with restart.