Fixup to avoid death on spawn