Fix multiple Org issue