Fix multiple Org issue
Merge pull request #876 from shenrie/master

Fix multiple Org issue