fixes
Merge pull request #231 from smogon/91bd13c2efe74293d7f17dd9dd1b07cb

fixes