Also fixed "Restart" bug