Merge pull request #1116 from conejoninja/hotfixes

small fix