fix make_tuple implementation