diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd7878fd..469bbaeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ## Unreleased
 
+## [1.12.2] - 2019-04-22
+
+### Refactor
+
+- Performance improvements
+  - The `state` control was removed from the text mask component, using only the props to handle the mask.
+  - We changed the base text mask from `Component` to `PureComponent`.
+  - BREAKING: the `value` and `onChangeText` are now **required** props.
+  - These changes probably will fix (need to check with the reporters):
+    - [Wrong input inserting unwanted text #146](https://github.com/benhurott/react-native-masked-text/issues/146)
+    - [Flickering of uncontrolled input #136](https://github.com/benhurott/react-native-masked-text/issues/136)
+
 ## [1.12.1] - 2019-04-09
 
 ### Fixed
diff --git a/README.md b/README.md
index 06b3af18..b5714a64 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,8 @@ import { TextInputMask } from 'react-native-masked-text'
       // the options for your mask if needed
     }
   }
+
+  // dont forget to set the "value" and "onChangeText" props
   value={this.state.text}
   onChangeText={text => {
     this.setState({
diff --git a/dist/lib/base-text-component.js b/dist/lib/base-text-component.js
index 35d13df2..df300f06 100644
--- a/dist/lib/base-text-component.js
+++ b/dist/lib/base-text-component.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _maskResolver=require('./mask-resolver');var _maskResolver2=_interopRequireDefault(_maskResolver);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var BaseTextComponent=function(_Component){_inherits(BaseTextComponent,_Component);function BaseTextComponent(props){_classCallCheck(this,BaseTextComponent);var _this=_possibleConstructorReturn(this,(BaseTextComponent.__proto__||Object.getPrototypeOf(BaseTextComponent)).call(this,props));_this.state={type:props.type,value:'',rawValue:'',options:props.options};_this._resolveMaskHandler();_this.state.value=_this._getDefaultMaskedValue(props.value);return _this;}_createClass(BaseTextComponent,[{key:'componentDidMount',value:function componentDidMount(){this._bindProps(this.props);}},{key:'componentWillReceiveProps',value:function componentWillReceiveProps(nextProps){this._bindProps(nextProps);}},{key:'updateValue',value:function updateValue(text){var self=this;return new Promise(function(resolve,reject){var maskedText=self._getMaskedValue(text);var rawText=self.props.includeRawValueInChangeText?self.getRawValueFor(maskedText):undefined;if(self._mustUpdateValue(maskedText)){self.setState({value:maskedText,rawValue:rawText},function(){resolve({maskedText:maskedText,rawText:rawText});});}else{resolve({maskedText:self.state.value,rawText:self.state.rawValue});}});}},{key:'isValid',value:function isValid(){return this._maskHandler.validate(this._getDefaultValue(this.state.value),this.state.options);}},{key:'getRawValueFor',value:function getRawValueFor(value){return this._maskHandler.getRawValue(this._getDefaultValue(value),this.state.options);}},{key:'getRawValue',value:function getRawValue(){return this.getRawValueFor(this.state.value);}},{key:'_mustUpdateValue',value:function _mustUpdateValue(newValue){return this.state.value!==newValue;}},{key:'_resolveMaskHandler',value:function _resolveMaskHandler(){this._maskHandler=_maskResolver2.default.resolve(this.state.type);}},{key:'_bindProps',value:function _bindProps(props){var self=this;var changeMaskHandler=this.state.type!==props.type;self.setState({type:props.type,options:props.options},function(){if(changeMaskHandler){self._resolveMaskHandler();}var value=self._getDefaultMaskedValue(props.value);self.setState({value:value});});}},{key:'_getDefaultMaskedValue',value:function _getDefaultMaskedValue(value){if(this._getDefaultValue(value)===''){return'';}return this._getMaskedValue(value);}},{key:'_getMaskedValue',value:function _getMaskedValue(value){var oldValue=this.state.value;return this._maskHandler.getValue(this._getDefaultValue(value),this.state.options,oldValue);}},{key:'_getDefaultValue',value:function _getDefaultValue(value){if(value===undefined||value===null){return'';}return value;}}]);return BaseTextComponent;}(_react.Component);exports.default=BaseTextComponent;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _maskResolver=require('./mask-resolver');var _maskResolver2=_interopRequireDefault(_maskResolver);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var BaseTextComponent=function(_PureComponent){_inherits(BaseTextComponent,_PureComponent);function BaseTextComponent(props){_classCallCheck(this,BaseTextComponent);var _this=_possibleConstructorReturn(this,(BaseTextComponent.__proto__||Object.getPrototypeOf(BaseTextComponent)).call(this,props));_this._resolveMaskHandler();return _this;}_createClass(BaseTextComponent,[{key:'componentDidMount',value:function componentDidMount(){this._bindProps(this.props);}},{key:'componentWillReceiveProps',value:function componentWillReceiveProps(nextProps){this._bindProps(nextProps);}},{key:'updateValue',value:function updateValue(text){var maskedText=this._getMaskedValue(text);var rawText=this.props.includeRawValueInChangeText?this.getRawValueFor(maskedText):undefined;return{maskedText:maskedText,rawText:rawText};}},{key:'isValid',value:function isValid(){return this._maskHandler.validate(this._getDefaultValue(this.props.value),this._getOptions());}},{key:'getRawValueFor',value:function getRawValueFor(value){return this._maskHandler.getRawValue(this._getDefaultValue(value),this._getOptions());}},{key:'getRawValue',value:function getRawValue(){return this.getRawValueFor(this.props.value);}},{key:'_getOptions',value:function _getOptions(){return this.props.options;}},{key:'_mustUpdateValue',value:function _mustUpdateValue(newValue){return this.props.value!==newValue;}},{key:'_resolveMaskHandler',value:function _resolveMaskHandler(){this._maskHandler=_maskResolver2.default.resolve(this.props.type);}},{key:'_bindProps',value:function _bindProps(nextProps){if(this.props.type!==nextProps.type){this._resolveMaskHandler();}}},{key:'_getDefaultMaskedValue',value:function _getDefaultMaskedValue(value){if(this._getDefaultValue(value)===''){return'';}return this._getMaskedValue(value);}},{key:'_getMaskedValue',value:function _getMaskedValue(value){return this._maskHandler.getValue(this._getDefaultValue(value),this._getOptions());}},{key:'_getDefaultValue',value:function _getDefaultValue(value){if(value===undefined||value===null){return'';}return value;}}]);return BaseTextComponent;}(_react.PureComponent);exports.default=BaseTextComponent;
\ No newline at end of file
diff --git a/dist/lib/text-input-mask.js b/dist/lib/text-input-mask.js
index b851c58f..2e811dc2 100644
--- a/dist/lib/text-input-mask.js
+++ b/dist/lib/text-input-mask.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='./lib/text-input-mask.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _reactNative=require('react-native');var _baseTextComponent=require('./base-text-component');var _baseTextComponent2=_interopRequireDefault(_baseTextComponent);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var TextInputMask=function(_BaseTextComponent){_inherits(TextInputMask,_BaseTextComponent);function TextInputMask(){_classCallCheck(this,TextInputMask);return _possibleConstructorReturn(this,(TextInputMask.__proto__||Object.getPrototypeOf(TextInputMask)).apply(this,arguments));}_createClass(TextInputMask,[{key:'getElement',value:function getElement(){return this._inputElement;}},{key:'_onChangeText',value:function _onChangeText(text){var _this2=this;var self=this;if(!this._checkText(text)){return;}self.updateValue(text).then(function(_ref){var maskedText=_ref.maskedText,rawText=_ref.rawText;if(self.props.onChangeText){_this2._trySetNativeProps(maskedText);self.props.onChangeText(maskedText,rawText);}});}},{key:'_trySetNativeProps',value:function _trySetNativeProps(maskedText){try{var element=this.getElement();element.setNativeProps&&element.setNativeProps({text:maskedText});}catch(error){}}},{key:'_checkText',value:function _checkText(text){if(this.props.checkText){return this.props.checkText(this.state.value,text);}return true;}},{key:'_getKeyboardType',value:function _getKeyboardType(){return this.props.keyboardType||this._maskHandler.getKeyboardType();}},{key:'render',value:function render(){var _this3=this;var Input=_reactNative.TextInput;var customTextInputProps={};if(this.props.customTextInput){Input=this.props.customTextInput;customTextInputProps=this.props.customTextInputProps||{};}return _react2.default.createElement(Input,_extends({ref:function ref(_ref2){if(_ref2){_this3._inputElement=_ref2;if(typeof _this3.props.refInput==='function'){_this3.props.refInput(_ref2);}}},keyboardType:this._getKeyboardType()},this.props,customTextInputProps,{onChangeText:function onChangeText(text){return _this3._onChangeText(text);},value:this.state.value,__source:{fileName:_jsxFileName,lineNumber:57}}));}}]);return TextInputMask;}(_baseTextComponent2.default);exports.default=TextInputMask;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='./lib/text-input-mask.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _reactNative=require('react-native');var _baseTextComponent=require('./base-text-component');var _baseTextComponent2=_interopRequireDefault(_baseTextComponent);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var TextInputMask=function(_BaseTextComponent){_inherits(TextInputMask,_BaseTextComponent);function TextInputMask(){_classCallCheck(this,TextInputMask);return _possibleConstructorReturn(this,(TextInputMask.__proto__||Object.getPrototypeOf(TextInputMask)).apply(this,arguments));}_createClass(TextInputMask,[{key:'getElement',value:function getElement(){return this._inputElement;}},{key:'_onChangeText',value:function _onChangeText(text){if(!this._checkText(text)){return;}var _updateValue=this.updateValue(text),maskedText=_updateValue.maskedText,rawText=_updateValue.rawText;if(this.props.onChangeText){this._trySetNativeProps(maskedText);this.props.onChangeText(maskedText,rawText);}}},{key:'_trySetNativeProps',value:function _trySetNativeProps(maskedText){try{var element=this.getElement();element.setNativeProps&&element.setNativeProps({text:maskedText});}catch(error){}}},{key:'_checkText',value:function _checkText(text){if(this.props.checkText){return this.props.checkText(this.props.value,text);}return true;}},{key:'_getKeyboardType',value:function _getKeyboardType(){return this.props.keyboardType||this._maskHandler.getKeyboardType();}},{key:'render',value:function render(){var _this2=this;var Input=_reactNative.TextInput;var customTextInputProps={};if(this.props.customTextInput){Input=this.props.customTextInput;customTextInputProps=this.props.customTextInputProps||{};}return _react2.default.createElement(Input,_extends({ref:function ref(_ref){if(_ref){_this2._inputElement=_ref;if(typeof _this2.props.refInput==='function'){_this2.props.refInput(_ref);}}},keyboardType:this._getKeyboardType()},this.props,customTextInputProps,{onChangeText:function onChangeText(text){return _this2._onChangeText(text);},value:this.props.value,__source:{fileName:_jsxFileName,lineNumber:54}}));}}]);return TextInputMask;}(_baseTextComponent2.default);exports.default=TextInputMask;
\ No newline at end of file
diff --git a/dist/lib/text-mask.js b/dist/lib/text-mask.js
index 10d47cd9..6f7c84a7 100644
--- a/dist/lib/text-mask.js
+++ b/dist/lib/text-mask.js
@@ -1 +1 @@
-Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='./lib/text-mask.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _reactNative=require('react-native');var _baseTextComponent=require('./base-text-component');var _baseTextComponent2=_interopRequireDefault(_baseTextComponent);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var TEXT_REF='$text';var TextMask=function(_BaseTextComponent){_inherits(TextMask,_BaseTextComponent);function TextMask(props){_classCallCheck(this,TextMask);return _possibleConstructorReturn(this,(TextMask.__proto__||Object.getPrototypeOf(TextMask)).call(this,props));}_createClass(TextMask,[{key:'getElement',value:function getElement(){return this.refs[TEXT_REF];}},{key:'render',value:function render(){return _react2.default.createElement(_reactNative.Text,_extends({ref:TEXT_REF},this.props,{__source:{fileName:_jsxFileName,lineNumber:21}}),this.state.value);}}]);return TextMask;}(_baseTextComponent2.default);exports.default=TextMask;
\ No newline at end of file
+Object.defineProperty(exports,"__esModule",{value:true});var _extends=Object.assign||function(target){for(var i=1;i<arguments.length;i++){var source=arguments[i];for(var key in source){if(Object.prototype.hasOwnProperty.call(source,key)){target[key]=source[key];}}}return target;};var _jsxFileName='./lib/text-mask.js';var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();var _react=require('react');var _react2=_interopRequireDefault(_react);var _reactNative=require('react-native');var _baseTextComponent=require('./base-text-component');var _baseTextComponent2=_interopRequireDefault(_baseTextComponent);function _interopRequireDefault(obj){return obj&&obj.__esModule?obj:{default:obj};}function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var TEXT_REF='$text';var TextMask=function(_BaseTextComponent){_inherits(TextMask,_BaseTextComponent);function TextMask(props){_classCallCheck(this,TextMask);return _possibleConstructorReturn(this,(TextMask.__proto__||Object.getPrototypeOf(TextMask)).call(this,props));}_createClass(TextMask,[{key:'getElement',value:function getElement(){return this.refs[TEXT_REF];}},{key:'render',value:function render(){return _react2.default.createElement(_reactNative.Text,_extends({ref:TEXT_REF},this.props,{__source:{fileName:_jsxFileName,lineNumber:20}}),this.props.value);}}]);return TextMask;}(_baseTextComponent2.default);exports.default=TextMask;
\ No newline at end of file
diff --git a/lib/base-text-component.js b/lib/base-text-component.js
index e416ff4d..f80c6a41 100644
--- a/lib/base-text-component.js
+++ b/lib/base-text-component.js
@@ -1,18 +1,10 @@
-import React, { Component } from 'react';
+import React, { PureComponent } from 'react';
 import MaskResolver from './mask-resolver';
 
-export default class BaseTextComponent extends Component {
+export default class BaseTextComponent extends PureComponent {
     constructor(props) {
         super(props);
-        this.state = {
-            type: props.type,
-            value: '',
-            rawValue: '',
-            options: props.options
-        };
-
         this._resolveMaskHandler();
-        this.state.value = this._getDefaultMaskedValue(props.value);
     }
 
     componentDidMount() {
@@ -24,75 +16,49 @@ export default class BaseTextComponent extends Component {
     }
 
     updateValue(text) {
-        let self = this;
-
-        return new Promise((resolve, reject) => {
-            let maskedText = self._getMaskedValue(text);
-            const rawText = self.props.includeRawValueInChangeText ? self.getRawValueFor(maskedText) : undefined
-
-			if(self._mustUpdateValue(maskedText)) {
-				self.setState({
-                    value: maskedText,
-                    rawValue: rawText
-				}, () => {
-					resolve({ 
-                        maskedText, 
-                        rawText
-                    });
-				});
-			} else {
-				resolve({
-                    maskedText: self.state.value,
-                    rawText: self.state.rawValue
-                });
-			}
-        });
+        let maskedText = this._getMaskedValue(text);
+        const rawText = this.props.includeRawValueInChangeText ? this.getRawValueFor(maskedText) : undefined
+
+        return {
+            maskedText,
+            rawText
+        }
     }
 
     isValid() {
         return this._maskHandler.validate(
-            this._getDefaultValue(this.state.value),
-            this.state.options
+            this._getDefaultValue(this.props.value),
+            this._getOptions()
         );
     }
 
     getRawValueFor(value) {
         return this._maskHandler.getRawValue(
             this._getDefaultValue(value),
-            this.state.options
+            this._getOptions()
         );
     }
 
     getRawValue() {
-        return this.getRawValueFor(this.state.value)
+        return this.getRawValueFor(this.props.value)
+    }
+
+    _getOptions() {
+        return this.props.options
     }
 
     _mustUpdateValue(newValue) {
-        return this.state.value !== newValue;
+        return this.props.value !== newValue;
     }
 
     _resolveMaskHandler() {
-        this._maskHandler = MaskResolver.resolve(this.state.type);
+        this._maskHandler = MaskResolver.resolve(this.props.type);
     }
 
-    _bindProps(props) {
-        let self = this;
-        let changeMaskHandler = this.state.type !== props.type;
-
-        self.setState({
-            type: props.type,
-            options: props.options
-        }, () => {
-            if (changeMaskHandler) {
-                self._resolveMaskHandler();
-            }
-
-            let value = self._getDefaultMaskedValue(props.value);
-
-            self.setState({
-                value: value
-            });
-        });
+    _bindProps(nextProps) {
+        if (this.props.type !== nextProps.type) {
+            this._resolveMaskHandler()
+        }
     }
 
     _getDefaultMaskedValue(value) {
@@ -104,12 +70,9 @@ export default class BaseTextComponent extends Component {
     }
 
     _getMaskedValue(value) {
-        let oldValue = this.state.value;
-
         return this._maskHandler.getValue(
             this._getDefaultValue(value),
-            this.state.options,
-            oldValue);
+            this._getOptions());
     }
 
     _getDefaultValue(value) {
diff --git a/lib/text-input-mask.js b/lib/text-input-mask.js
index cdff3ac6..d2d083d5 100644
--- a/lib/text-input-mask.js
+++ b/lib/text-input-mask.js
@@ -1,4 +1,3 @@
-// @flow
 import React from 'react'
 import { TextInput } from 'react-native'
 import BaseTextComponent from './base-text-component'
@@ -9,18 +8,16 @@ export default class TextInputMask extends BaseTextComponent {
     }
 
     _onChangeText(text) {
-        let self = this
-
         if (!this._checkText(text)) {
             return
         }
 
-        self.updateValue(text).then(({ maskedText, rawText }) => {
-            if (self.props.onChangeText) {
-                this._trySetNativeProps(maskedText)
-                self.props.onChangeText(maskedText, rawText)
-            }
-        })
+        const { maskedText, rawText } = this.updateValue(text)
+
+        if (this.props.onChangeText) {
+            this._trySetNativeProps(maskedText)
+            this.props.onChangeText(maskedText, rawText)
+        }
     }
 
     _trySetNativeProps(maskedText) {
@@ -34,7 +31,7 @@ export default class TextInputMask extends BaseTextComponent {
 
     _checkText(text) {
         if (this.props.checkText) {
-            return this.props.checkText(this.state.value, text)
+            return this.props.checkText(this.props.value, text)
         }
 
         return true
@@ -68,7 +65,7 @@ export default class TextInputMask extends BaseTextComponent {
                 {...this.props}
                 {...customTextInputProps}
                 onChangeText={text => this._onChangeText(text)}
-                value={this.state.value}
+                value={this.props.value}
             />
         )
     }
diff --git a/lib/text-mask.js b/lib/text-mask.js
index cfdb5a0b..e794484e 100644
--- a/lib/text-mask.js
+++ b/lib/text-mask.js
@@ -1,6 +1,5 @@
-import React, { Component } from 'react';
+import React from 'react';
 import {
-  StyleSheet,
   Text
 } from 'react-native';
 import BaseTextComponent from './base-text-component';
@@ -18,7 +17,7 @@ export default class TextMask extends BaseTextComponent {
 
 	render() {
 		return (
-			<Text ref={TEXT_REF} {...this.props}>{this.state.value}</Text>
+			<Text ref={TEXT_REF} {...this.props}>{this.props.value}</Text>
 		);
 	}
 }
diff --git a/package.json b/package.json
index c7d99ec8..3060d7f4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.12.1",
+    "version": "1.12.2",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {