Fix for tornado not disappearing bug