Fix some hanging holder