issue #1716 & #1721
Merge pull request #1730 from conejoninja/1716

issue #1716 & #1721