issue #1697
Merge pull request #1709 from conejoninja/1697

issue #1697