diff --git a/packages/maska/index.html b/packages/maska/index.html
index 84a5409..9fb9b79 100644
--- a/packages/maska/index.html
+++ b/packages/maska/index.html
@@ -8,7 +8,7 @@
 </head>
 <body>
   <div id="app">
-    <input data-maska="#-#">
+    <input data-maska="#-#" value="123">
   </div>
 
   <script type="module">
diff --git a/packages/maska/src/input.ts b/packages/maska/src/input.ts
index 31a3b7c..8ea30d3 100644
--- a/packages/maska/src/input.ts
+++ b/packages/maska/src/input.ts
@@ -24,10 +24,8 @@ export class MaskInput {
   }
 
   update (options: MaskInputOptions = {}): void {
-    const needUpdate = JSON.stringify(options) !== JSON.stringify(this.options)
-    this.options = options
-
-    this.init(Array.from(this.items.keys()), needUpdate)
+    this.options = { ...options }
+    this.init(Array.from(this.items.keys()))
   }
 
   updateValue (input: HTMLInputElement): void {
@@ -43,7 +41,7 @@ export class MaskInput {
     this.items.clear()
   }
 
-  private init (inputs: HTMLInputElement[], update = true): void {
+  private init (inputs: HTMLInputElement[]): void {
     const defaults = this.getOptions(this.options)
 
     for (const input of inputs) {
@@ -54,12 +52,10 @@ export class MaskInput {
       const mask = new Mask(parseInput(input, defaults))
       this.items.set(input, mask)
 
-      if (update) {
-        this.updateValue(input)
+      queueMicrotask(() => this.updateValue(input))
 
-        if (input.selectionStart === null && mask.isEager()) {
-          console.warn('Maska: input of `%s` type is not supported', input.type)
-        }
+      if (input.selectionStart === null && mask.isEager()) {
+        console.warn('Maska: input of `%s` type is not supported', input.type)
       }
     }
   }
diff --git a/packages/vue/src/vue.ts b/packages/vue/src/vue.ts
index 599b1a5..1bc17c6 100644
--- a/packages/vue/src/vue.ts
+++ b/packages/vue/src/vue.ts
@@ -43,14 +43,9 @@ export const vMaska: MaskaDirective = (el, binding) => {
           : [opts.onMaska, updateArg]
   }
 
-  let mask = masks.get(input)
-  if (mask != null) {
-    mask.update(opts)
+  if (masks.has(input)) {
+    masks.get(input)?.update(opts)
   } else {
-    mask = new MaskInput(input, opts)
-    masks.set(input, mask)
+    masks.set(input, new MaskInput(input, opts))
   }
-
-  // delay for possible v-model change
-  queueMicrotask(() => mask?.updateValue(input))
 }
