Fix remote storage to save and retrieve correctly.