Fix Reference resolution inside a tuple