fixes #1141379
Merge pull request #14 from aiacovella/wip-1141379

fixes #1141379