Fix it, again