Fixed restarts to work perfectly