Fix Tornado mode