issue #997
Merge pull request #1037 from conejoninja/997

issue #997