Fixes #58452008
Merge pull request #15 from aiacovella/wip-58452008

Fixes #58452008