issue #1449
Merge pull request #1500 from conejoninja/1449

1449