Trying to unbreak things