Fix it to work