diff --git a/fyo/utils/format.ts b/fyo/utils/format.ts
index 5cadb6a9..dfc5d142 100644
--- a/fyo/utils/format.ts
+++ b/fyo/utils/format.ts
@@ -1,9 +1,9 @@
 import { Fyo } from 'fyo';
 import { Doc } from 'fyo/model/doc';
 import { DateTime } from 'luxon';
-import { Money } from 'pesa';
 import { Field, FieldType, FieldTypeEnum } from 'schemas/types';
 import { getIsNullOrUndef, safeParseFloat, titleCase } from 'utils';
+import { isPesa } from '.';
 import {
   DEFAULT_CURRENCY,
   DEFAULT_DATE_FORMAT,
@@ -138,8 +138,8 @@ function formatNumber(value: unknown, fyo: Fyo): string {
     value = fyo.pesa(value.toFixed(20));
   }
 
-  if ((value as Money).round) {
-    const floatValue = safeParseFloat((value as Money).round());
+  if (isPesa(value)) {
+    const floatValue = safeParseFloat(value.round());
     return numberFormatter.format(floatValue);
   }
 
diff --git a/src/components/Controls/Currency.vue b/src/components/Controls/Currency.vue
index 13a2bae8..12e0f080 100644
--- a/src/components/Controls/Currency.vue
+++ b/src/components/Controls/Currency.vue
@@ -9,7 +9,7 @@
       class="text-end"
       :class="[inputClasses, containerClasses]"
       :type="inputType"
-      :value="value?.round()"
+      :value="round(value)"
       :placeholder="inputPlaceholder"
       :readonly="isReadOnly"
       :tabindex="isReadOnly ? '-1' : '0'"
@@ -29,13 +29,16 @@
     </div>
   </div>
 </template>
-
-<script>
+<script lang="ts">
+// @ts-nocheck
+import { isPesa } from 'fyo/utils';
+import { Money } from 'pesa';
 import { fyo } from 'src/initFyo';
-import { nextTick } from 'vue';
+import { safeParseFloat } from 'utils/index';
+import { defineComponent, nextTick } from 'vue';
 import Float from './Float.vue';
 
-export default {
+export default defineComponent({
   name: 'Currency',
   extends: Float,
   emits: ['input', 'focus'],
@@ -51,17 +54,44 @@ export default {
       this.showInput = true;
       this.$emit('focus', e);
     },
-    parse(value) {
-      return fyo.pesa(value);
+    round(v: unknown) {
+      if (!isPesa(v)) {
+        v = this.parse(v);
+      }
+
+      if (isPesa(v)) {
+        return v.round();
+      }
+
+      return fyo.pesa(0).round();
     },
-    onBlur(e) {
-      let { value } = e.target;
-      if (value !== 0 && !value) {
-        value = fyo.pesa(0).round();
+    parse(value: unknown): Money {
+      if (isPesa(value)) {
+        return value;
+      }
+
+      if (typeof value === 'string') {
+        value = safeParseFloat(value);
+      }
+
+      if (typeof value === 'number') {
+        return fyo.pesa(value);
+      }
+
+      if (typeof value === 'bigint') {
+        return fyo.pesa(value);
+      }
+
+      return fyo.pesa(0);
+    },
+    onBlur(e: FocusEvent) {
+      const target = e.target;
+      if (!(target instanceof HTMLInputElement)) {
+        return;
       }
 
       this.showInput = false;
-      this.triggerChange(value);
+      this.triggerChange(target.value);
     },
     activateInput() {
       if (this.isReadOnly) {
@@ -79,5 +109,5 @@ export default {
       return fyo.format(this.value ?? fyo.pesa(0), this.df, this.doc);
     },
   },
-};
+});
 </script>
diff --git a/src/components/Controls/Data.vue b/src/components/Controls/Data.vue
index a5be68e8..664afccf 100644
--- a/src/components/Controls/Data.vue
+++ b/src/components/Controls/Data.vue
@@ -1,13 +1,14 @@
-<script>
-import Base from './Base';
+<script lang="ts">
+import Base from './Base.vue';
+import { defineComponent } from 'vue';
 
-export default {
+export default defineComponent({
   name: 'Data',
   extends: Base,
   computed: {
     inputType() {
       return 'text';
-    }
-  }
-};
+    },
+  },
+});
 </script>
diff --git a/src/components/Controls/Float.vue b/src/components/Controls/Float.vue
index bde95f9e..5eeb964b 100644
--- a/src/components/Controls/Float.vue
+++ b/src/components/Controls/Float.vue
@@ -1,19 +1,20 @@
-<script>
+<script lang="ts">
 import { safeParseFloat } from 'utils/index';
+import { defineComponent } from 'vue';
 import Int from './Int.vue';
 
-export default {
+export default defineComponent({
   name: 'Float',
   extends: Int,
   computed: {
     inputType() {
       return 'number';
-    }
-  },
-  methods: {
-    parse(value) {
-      return safeParseFloat(value)
     },
   },
-};
+  methods: {
+    parse(value: unknown): number {
+      return safeParseFloat(value);
+    },
+  },
+});
 </script>
diff --git a/src/components/Controls/Int.vue b/src/components/Controls/Int.vue
index 4e2564a3..5f0970d1 100644
--- a/src/components/Controls/Int.vue
+++ b/src/components/Controls/Int.vue
@@ -1,7 +1,9 @@
-<script>
-import Data from "./Data.vue";
+<script lang="ts">
+import Data from './Data.vue';
+import { defineComponent } from 'vue';
+import { safeParseInt } from 'utils/index';
 
-export default {
+export default defineComponent({
   name: 'Int',
   extends: Data,
   computed: {
@@ -10,10 +12,9 @@ export default {
     },
   },
   methods: {
-    parse(value) {
-      const parsedValue = parseInt(value, 10);
-      return isNaN(parsedValue) ? 0 : parsedValue;
+    parse(value: unknown): number {
+      return safeParseInt(value);
     },
   },
-};
+});
 </script>
diff --git a/utils/index.ts b/utils/index.ts
index c0ece896..bd0c6329 100644
--- a/utils/index.ts
+++ b/utils/index.ts
@@ -180,11 +180,11 @@ function safeParseNumber(value: unknown, parser: (v: string) => number) {
 }
 
 export function safeParseFloat(value: unknown): number {
-  return safeParseNumber(value, parseFloat);
+  return safeParseNumber(value, Number);
 }
 
 export function safeParseInt(value: unknown): number {
-  return safeParseNumber(value, parseInt);
+  return safeParseNumber(value, (v: string) => Math.trunc(Number(v)));
 }
 
 export function joinMapLists<A, B>(