Fix it right this time