more restore fixing