Fix/improve dying