issue #1455
Merge pull request #1552 from conejoninja/1455

issue #1455