uncomment
Merge pull request #1736 from conejoninja/fixes

uncomment