Fix the ward crash