bodge, plz fix thx