Fix 85
Merge pull request #88 from piti118/fix85

Fix 85