Fix issue with 2 or more digit numbers for subformulas