Fix to tuple_raw_input