Fix for EnsureDead, with test