Fix issue with restarting...