Integrate the fix from PR #44