fix for GitHub issue #32