Fixed sharing bugs