should fix occasional death on spawn