If it is broken, fix it