Fixed Restart Bug