Fixed NP at death
Correctly saving the end location