issue #1367
Merge pull request #1545 from conejoninja/1367

issue #1367