Fix share issue