issue #1237
Merge pull request #1238 from conejoninja/1237

issue #1237