issue #1673
Merge pull request #1707 from conejoninja/1673

issue #1673