Fix for zombies