more fix for GitHub issue #31