fixes
Merge pull request #413 from smogon/178e24feee0884657df1607839776b93

fixes