Attempt to fix the long number suffix discrepancy