Restart() fix