Actually fix troll hell vanish issues