Merge pull request #236 from huangnoah/fix-70

Fix 70