If it isn't broken, fix it anyway!