Fixed Save restoration