If you PM me, I can put you in touch with a guy I know who has figured a work-around for the Death bug. It's quite resource-heavy and requires a bit of commitment from the user to run, but I'm reassured the UX will be amazing in the end.