Fixed no KeyValueStore was saved to a new company