Fix issue #97
Merge pull request #99 from lyncodev/issue97-2.1.x

Fix issue #97 [2.1.5]