Fixed restart loops