Backport fix from PR #490

[lohedges]

This PR backports the fix from #490 into main.

• I confirm that I have merged the latest version of main into this branch before issuing this pull request (e.g. by running git pull origin main): [y]
• I confirm that I have added a changelog entry to the changelog (we will add a link to this PR as part of the review): [y]
• I confirm that I have permission to release this code under the GPL3 license: [y]