issue #1358
Merge pull request #1497 from conejoninja/1358

1358