Fix cycle dependence of outorg and outshine.
Merge pull request #1942 from deftsp/master

Fix cycle dependence of outorg and outshine.