Fix it up to work.