temporary fix for issue 789
Merge pull request #837 from yilongli/temporary-fix-for-issue-789

temporary fix for issue 789