whirlwind + fly fix
Merge pull request #1076 from Withoutatrace/windwhirl

whirlwind + fly fix