Restart bug fix