*Modify fix to only support Tuples and hence pass all tests