Fix it the rest of the way