fixed the thing with the thing

merge plz ty