Fix Zombie
Adjust Indentation
Merge pull request #1918 from DaNiwa/zombie_fix

Zombie fix