fixes
Merge pull request #1737 from conejoninja/fixes

fixes