Add auto restart with bugs