Fix issue #97 [2.1.5]

Fix issue #97 [2.1.5]