Fixed make_stub