fix for #1628
Merge pull request #1636 from conejoninja/1628fix

fix for #1628
fix
Merge pull request #1637 from conejoninja/1628fix

fix