Fix a serious oversight that occurred when merging pull request #919 into 0.9-work for this pull request