Fixed restart issue