MT#7793 Fix cases where sub only has one number