Fix #317.
Merge pull request #318 from take-cheeze/fix_317

Fix #317.