fix what Andre fixed and then I broke and fixed