fixes issue #524
Merge pull request #525 from WellingGuzman/issue-524

fixes issue #524