fix issue #384
Merge pull request #489 from WellingGuzman/issue-384

fix issue #384