issue #997
Merge pull request #1033 from conejoninja/hotfixes

issue #987
Merge pull request #1037 from conejoninja/997

issue #997