Regression of bug fix 7dc99a8 after merge PR #82