issue #1659
Merge pull request #1705 from conejoninja/1659

issue #1659