Fixed Restart bug