fixes
Merge pull request #1661 from conejoninja/fixes

fixes