issue #1240
Merge pull request #1242 from conejoninja/1240

issue #1240