temporary fix for issue 850
Merge pull request #851 from yilongli/temporary-fix-for-issue-850

temporary fix for issue 850