Fix issue #101

I think this commit may fix the issue #101