Fixed things, then stuff broke again