Fixed not restarting if failed