Zombie mode fix

I want to fix this annoying crash in zombie mode, so I compared the original gadget and zombie mode gadget and copy some magic.