DamageSystem fixes