Yeah, further down the code the same damage check gets used again. Would be nice if there was a fix.