Fixed restart implementation