Fix tornado not stopping bug