Fix restart issue