issue #1589
Merge pull request #1590 from conejoninja/1589

issue #1589