issue #1489
Merge pull request #1494 from conejoninja/1489

1489