Fix issue #302
Merge pull request #375 from layzerar/issue302

Fix issue #302