fixed hanging issue.
fixed hanging issue.