issue #1688
Merge pull request #1708 from conejoninja/1688

issue #1688