Should fix #5304 (closed) (can't really test it though, so YMMV...doesn't seem to break normal deaths though).