diff --git a/src/ts/plugins/metrica.ts b/src/ts/plugins/metrica.ts
index 23f9adc5..51df543a 100644
--- a/src/ts/plugins/metrica.ts
+++ b/src/ts/plugins/metrica.ts
@@ -14,55 +14,18 @@ const convertion:[string,string,number][] = [
 
 export function metricaPlugin(data:string, toSystem:'metrics'|'imperial'){
     const c = convertion.sort((a,b) => b[0].length - a[0].length);    
-
-    for(let i=0;i<data.length;i++){
-        function extractNumber(data:string, i:number){
-            let number = '';
-            while(i > 0){
-                i--;
-                if(data[i] === ' ' || data[i] === '\n' || data[i] === '\t' || data[i] === ','){
-                    continue
-                }
-                if(data[i] === '.'){
-                    number = '.' + number;
-                    continue;
-                }
-                if(isNaN(Number(data[i]))){
-                    break;
-                }
-                number = data[i] + number;
-            }
-            i++
-            while(data[i] === ' ' || data[i] === '\n' || data[i] === '\t' || data[i] === ','){
-                i++;
-            }
-            return {
-                number: number === '' ? 0 : Number(number),
-                index: i
-            };
+    for(let i = 0; i < c.length; i++){
+        let [from, to, ratio] = c[i];
+        if(toSystem === 'imperial'){
+            [from, to] = [to, from];
+            ratio = 1 / ratio;
         }
-
-        let sub = ''
-        let sublen = 0;
-        for(let j=0;j<c.length;j++){
-            const [from, to, ratio] = (toSystem === 'imperial') ? c[j] : [c[j][1], c[j][0], 1/c[j][2]];
-            if(sublen !== from.length){
-                sub = data.substring(i,i+from.length)
-                sublen = from.length;
-            }
-            if(sub === from){
-                const n = extractNumber(data, i);
-                if(n .number !== 0){
-                    const num = (n.number * ratio)
-                    const rto = (num >= 1) ? num.toFixed(0) : num.toFixed(1);
-                    const newData = data.substring(0, n.index) + rto + ' ' + to + data.substring(i+from.length);
-                    const offset = newData.length - data.length;
-                    i += offset;
-                    data = newData;
-                }
-            }
-        }
-
+        const reg = new RegExp(`(\\d+(?:\\.\\d+)?)\\s*${from}`, 'g');
+        data = data.replace(reg, (_, value) => {
+            const result = parseFloat(value) * ratio;
+            return `${result.toFixed(2)} ${to}`;
+        });
     }
+    
     return data
 }
\ No newline at end of file