issue #1594
Merge pull request #1601 from conejoninja/1594

issue #1594