unbreak things a bit