Fixed kill issue