Fix for circular restore