fix otr crap partly