share-data fix