[Fix] Get rid of double killing once and for all :3