Fix troll hell vanishing issues