Fixing share issue