When things are broken, fix them