Fixed issue with ShareService