issue #1220
Merge pull request #1226 from conejoninja/1220

issue #1220