Fix it right