Mourning/Grief moodlet although Sim was spared/resurrected

This has happened every time I have a sim that gets spared since I got the new life & death pack. The grief style gets triggered as soon as the sim STARTS dying, and then there's no way to (without cheats) remove it (aside from just letting it play out and dealing with their grief as if the sim actually died), even if they have other moodlets related to witnessing the sim come back to life. Honestly this would probably be fixed if there was a short term reaction mood to witnessing the death, but no longer term grief or mourning until the sim has actually been reaped.