diff --git a/package-lock.json b/package-lock.json
index 852be12..32ca72d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "formatstring",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index b5fc70e..56ccfee 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "formatstring",
-	"version": "6.0.0",
+	"version": "6.0.1",
 	"description": "",
 	"license": "",
 	"author": "",
diff --git a/src/formatstring/widget/formatstring.js b/src/formatstring/widget/formatstring.js
index 34a3804..7db420a 100644
--- a/src/formatstring/widget/formatstring.js
+++ b/src/formatstring/widget/formatstring.js
@@ -12,8 +12,6 @@ define([
 ], function(declare, _WidgetBase, dom, lang, dojo, dojoArray, domClass, on, dojoLocale, languagePack) {
     "use strict";
 
-    // var debug = logger.debug;
-
     return declare("formatstring.widget.formatstring", [_WidgetBase], {
 
         _contextObj: null,
@@ -23,7 +21,7 @@ define([
         onclicknf: {}, // Nanoflows are not strings, so need to make sure its always an object
 
         postCreate: function() {
-            logger.debug(this.id + ".postCreate");
+            mx.logger.debug(this.id + ".postCreate");
 
             this._timeData = languagePack;
 
@@ -35,7 +33,7 @@ define([
         },
 
         update: function(obj, callback) {
-            logger.debug(this.id + ".update");
+            mx.logger.debug(this.id + ".update");
             this._contextObj = obj;
             this._resetSubscriptions();
 
@@ -43,7 +41,7 @@ define([
         },
 
         _setupEvents: function() {
-            logger.debug(this.id + "._setupEvents");
+            mx.logger.debug(this.id + "._setupEvents");
             on(this.domNode, "click", lang.hitch(this, function(e) {
                 this.execOnclick();
                 if (this.stopClickPropagation) {
@@ -60,7 +58,7 @@ define([
         },
 
         _loadData: function(callback) {
-            logger.debug(this.id + "._loadData");
+            mx.logger.debug(this.id + "._loadData");
             this._replaceAttr = [];
 
             if (!this._contextObj) {
@@ -82,7 +80,7 @@ define([
                                 value: value
                             });
                         } else {
-                            logger.warn(this.id + "._loadData: You have an empty variable name, skipping! Please check Data source -> Attributes -> Variable Name");
+                            mx.logger.warn(this.id + "._loadData: You have an empty variable name, skipping! Please check Data source -> Attributes -> Variable Name");
                         }
                         cb();
                     };
@@ -95,8 +93,8 @@ define([
         },
 
         _fetchRef: function(attrObj) {
-            logger.debug(this.id + "._fetchRef");
-            
+            mx.logger.debug(this.id + "._fetchRef");
+
             return function(cb) {
                 this._contextObj.fetch(attrObj.attrs, lang.hitch(this, function (value) {
                     this._replaceAttr.push({
@@ -109,8 +107,8 @@ define([
         },
 
         _fetchAttr: function(obj, attr, attrObj) {
-            logger.debug(this.id + "._fetchAttr");
-            
+            mx.logger.debug(this.id + "._fetchAttr");
+
             // Referenced object might be empty, can"t fetch an attr on empty
             if (!obj) {
                 return attrObj.emptyReplacement;
@@ -153,7 +151,7 @@ define([
 
         // _buildString also does _renderString because of callback from fetchReferences is async.
         _buildString: function(callback) {
-            logger.debug(this.id + "._buildString");
+            mx.logger.debug(this.id + "._buildString");
 
             var str = this.displaystr,
                 classStr = this.classstr;
@@ -166,7 +164,7 @@ define([
         },
 
         _renderString: function(msg, classStr, callback) {
-            logger.debug(this.id + "._renderString");
+            mx.logger.debug(this.id + "._renderString");
 
             dojo.empty(this.domNode);
             var div = dom.create("div", {
@@ -179,7 +177,7 @@ define([
         },
 
         _checkString: function(string, renderAsHTML) {
-            logger.debug(this.id + "._checkString");
+            mx.logger.debug(this.id + "._checkString");
             if (string.indexOf("<script") > -1 || !renderAsHTML) {
                 string = dom.escapeString(string);
             }
@@ -187,7 +185,7 @@ define([
         },
 
         _parseDate: function(format, options, value) {
-            logger.debug(this.id + "._parseDate");
+            mx.logger.debug(this.id + "._parseDate");
             var datevalue = value;
 
             if (value === "") {
@@ -204,7 +202,7 @@ define([
         },
 
         _parseTimeAgo: function(value, data) {
-            logger.debug(this.id + "._parseTimeAgo");
+            mx.logger.debug(this.id + "._parseTimeAgo");
             var date = new Date(value),
                 now = new Date(),
                 appendStr = null,
@@ -269,7 +267,7 @@ define([
         },
 
         execOnclick: function() {
-            logger.debug(this.id + ".execOnclick");
+            mx.logger.debug(this.id + ".execOnclick");
             if (!this._contextObj) {
                 return;
             }
@@ -282,7 +280,7 @@ define([
                         guids: [this._contextObj.getGuid()]
                     },
                     error: function(error) {
-                        logger.error(this.id + ": An error ocurred while executing microflow: ", error);
+                        mx.logger.error(this.id + ": An error occurred while executing microflow: ", error);
                     }
                 };
                 if (!mx.version || mx.version && parseInt(mx.version.split(".")[0]) < 7) {
@@ -302,14 +300,14 @@ define([
                     origin: this.mxform,
                     context: this.mxcontext,
                     error: function(error) {
-                        logger.error(this.id + ": An error ocurred while executing nanflow: ", error);
+                        mx.logger.error(this.id + ": An error occurred while executing nanoflow: ", error);
                     }
                 });
             }
         },
 
         _resetSubscriptions: function() {
-            logger.debug(this.id + "._resetSubscriptions");
+            mx.logger.debug(this.id + "._resetSubscriptions");
             this.unsubscribeAll();
 
             if (this._contextObj) {
@@ -329,7 +327,7 @@ define([
         },
 
         _executeCallback: function(cb, from) {
-            logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
+            mx.logger.debug(this.id + "._executeCallback" + (from ? " from " + from : ""));
             if (cb && typeof cb === "function") {
                 cb();
             }
diff --git a/src/package.xml b/src/package.xml
index bb82f35..e7cb954 100644
--- a/src/package.xml
+++ b/src/package.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://www.mendix.com/package/1.0/">
-    <clientModule name="formatstring" version="5.8.0" xmlns="http://www.mendix.com/clientModule/1.0/">
+    <clientModule name="formatstring" version="6.0.1" xmlns="http://www.mendix.com/clientModule/1.0/">
         <widgetFiles>
             <widgetFile path="formatstring/formatstring.xml"/>
         </widgetFiles>
@@ -8,4 +8,4 @@
             <file path="formatstring/widget/"/>
         </files>
     </clientModule>
-</package>
\ No newline at end of file
+</package>
diff --git a/test/widgets/FormatString.mpk b/test/widgets/FormatString.mpk
index 5a1a1cf..52e1d52 100644
Binary files a/test/widgets/FormatString.mpk and b/test/widgets/FormatString.mpk differ