Feature/share bug