better restart support