Fix a metric shitload of brainfarts