issue #1170
Merge pull request #1181 from conejoninja/1170

issue #1170