Fix dying bug