Remaining fix for pull request #34
Fixes issue #30