Don't Patch It, Fix It