Fix issue with tuples