diff --git a/ignite-template.js b/ignite-template.js
index 41c614c..90d5d5f 100644
--- a/ignite-template.js
+++ b/ignite-template.js
@@ -163,13 +163,17 @@ class IgniteTemplate {
             this._callbacks.push(value.attachOnSplice((list, start, deleteCount, items) => this.onValueChanged((converter != null ? converter(list) : null))));
 
             if (reflect != null && ((typeof (reflect) == "boolean" && reflect == true) || reflect instanceof Function)) {
-                this.on("change", e => {
+                var valueChanged = e => {
                     var newValue = null;
 
-                    if (this.element.hasAttribute("type") && this.element.getAttribute("type").toLowerCase().trim() == "checkbox") {
+                    var type = this.element.hasAttribute("type") ? this.element.getAttribute("type").toLowerCase().trim() : null;
+
+                    if (type == "checkbox") {
                         newValue = this.element.checked;
-                    } else if (this.element.hasAttribute("type") && this.element.getAttribute("type").toLowerCase().trim() == "radio") {
+                    } else if (type == "radio") {
                         newValue = this.element.checked;
+                    } else if (type == "number") {
+                        newValue = Number(this.element.value);
                     } else if (this.element.hasAttribute("contenteditable") && this.element.getAttribute("contenteditable").toLowerCase().trim() == "true") {
                         newValue = this.element.textContent;
                     } else {
@@ -181,23 +185,10 @@ class IgniteTemplate {
                     } else {
                         value.setValue(newValue, true);
                     }
-                });
+                };
 
-                this.on("keyup", e => {
-                    var newValue = null;
-
-                    if (this.element.hasAttribute("contenteditable") && this.element.getAttribute("contenteditable").toLowerCase().trim() == "true") {
-                        newValue = this.element.textContent;
-                    } else {
-                        newValue = this.element.value;
-                    }
-
-                    if (reflect instanceof Function) {
-                        reflect(newValue);
-                    } else {
-                        value.setValue(newValue, true);
-                    }
-                });
+                this.on("change", valueChanged);
+                this.on("keyup", valueChanged);
             }
 
             this._elementValue = (converter != null ? converter(value.value) : value.value);