Fix issue #349
Merge pull request #396 from gintenlabo/fix-test

Fix issue #349