CHANGED:try to fix up the multi return issue