Fixed restart crash