issue #1167
Merge pull request #1180 from conejoninja/1167

issue #1167