Fix unjustified kill bug