Fix fight fields