Fix same error like PR #61
Merge pull request #105 from fadoe/master

Fix same error like PR #61