issue #1728
Merge pull request #1731 from conejoninja/1728

issue #1728