Minor changes

Why restart here instead of stop?