Make restart work