Fix restart ...