Whirlwind attack fix.