issue #1671
Merge pull request #1706 from conejoninja/1671

issue #1671