Fixed sharing issue