Issue fix

Fixes a reported bug starting from its reproduction, pushes the fix to a branch of its own and opens a draft pull request.