improvement in restart-handling