diff --git a/CHANGELOG.md b/CHANGELOG.md
index 469bbaeb..6a079662 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## [1.12.3] - 2019-05-17
+
+### Fix
+
+- Fixing [#162](https://github.com/benhurott/react-native-masked-text/issues/162) initial value when mask is updated. (thanks to [Alessandro Sales](https://github.com/alessandrosales) for reporting)
+
 ## [1.12.2] - 2019-04-22
 
 ### Refactor
diff --git a/dist/lib/base-text-component.js b/dist/lib/base-text-component.js
index df300f06..b5094711 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(_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
+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:'getDisplayValueFor',value:function getDisplayValueFor(value){return this._getMaskedValue(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 2e811dc2..a4b74feb 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){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
+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.getDisplayValueFor(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 6f7c84a7..21eadb25 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:20}}),this.props.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.getDisplayValueFor(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 f80c6a41..a9a8a467 100644
--- a/lib/base-text-component.js
+++ b/lib/base-text-component.js
@@ -43,6 +43,10 @@ export default class BaseTextComponent extends PureComponent {
         return this.getRawValueFor(this.props.value)
     }
 
+    getDisplayValueFor(value) {
+        return this._getMaskedValue(value)
+    }
+
     _getOptions() {
         return this.props.options
     }
diff --git a/lib/text-input-mask.js b/lib/text-input-mask.js
index d2d083d5..b1be76e7 100644
--- a/lib/text-input-mask.js
+++ b/lib/text-input-mask.js
@@ -65,7 +65,11 @@ export default class TextInputMask extends BaseTextComponent {
                 {...this.props}
                 {...customTextInputProps}
                 onChangeText={text => this._onChangeText(text)}
-                value={this.props.value}
+                value={
+                    this.getDisplayValueFor(
+                        this.props.value
+                    )
+                }
             />
         )
     }
diff --git a/lib/text-mask.js b/lib/text-mask.js
index e794484e..08041f8b 100644
--- a/lib/text-mask.js
+++ b/lib/text-mask.js
@@ -17,7 +17,11 @@ export default class TextMask extends BaseTextComponent {
 
 	render() {
 		return (
-			<Text ref={TEXT_REF} {...this.props}>{this.props.value}</Text>
+			<Text ref={TEXT_REF} {...this.props}>{
+				this.getDisplayValueFor(
+					this.props.value
+				)
+			}</Text>
 		);
 	}
 }
diff --git a/package.json b/package.json
index 3060d7f4..1060d91f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "react-native-masked-text",
-    "version": "1.12.2",
+    "version": "1.12.3",
     "description": "Text and TextInput with mask for React Native applications",
     "licenses": [
         {