Fixing SI-7443 for NumericRange