Fixed issues with tuples