issue #1650
Merge pull request #1655 from conejoninja/1650

issue #1650