Added repair step for legacy storages