Fight system fix