fix make_tuple