Fix some restoration process