[BUG] Cherrypick changes from PR #47 into the main branch

[osinjoku]

Describe the bug
The fix in #47 for release/26 needs to brought into the main branch.

Additional context
Add any other context about the problem here.