Be more accurate in number matching