Fix restart issue.
Merge pull request #109 from JackDandy/feature/FixRestart

Fix restart issue.