Feature/fix sharing