[Issue #197] Implement better handling of repeated kills