Merge pull request #224 from huangnoah/fix-70

Fix 70
fix cases