issue #1223
Merge pull request #1227 from conejoninja/1223

issue #1223