Also call kill in the right context