Fix for 8-tuples and 9-tuples