Fix it up