Fix for n-tuples