Fixing incompabilities with original sharekit