Finish an incomplete fix so we don't get a NameError