fix issue #417
Merge pull request #418 from xeroc/master

fix issue #417