Changes to the subscript handling to deal with numbers greater than 9