Fix remote saving