This issue is a follow-up to the work from this PR: #126
This issue is a follow-up to the work from this PR: #126