now works on restarts