fix for issue195
Merge pull request #197 from fulv/issue195_for_master

fix for issue195