Fix make_self for 4.xx