diff --git a/README.md b/README.md
index 4723007..60edc52 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,10 @@ TO DO:
 Version Changes Control
 =======================
 
+v0.0.12 - 2020-04-13
+------------------------
+- Correction on node: JSON Marshal, wrong ',' calculations (again)
+
 v0.0.12 - 2020-04-13
 ------------------------
 - Correction on node: JSON Marshal, wrong ',' calculations
diff --git a/node.go b/node.go
index 09607fd..a2461fc 100644
--- a/node.go
+++ b/node.go
@@ -292,12 +292,12 @@ func (n *Node) MarshalJSON() ([]byte, error) {
 			buffer.WriteString("\"type\":\"" + n.Type + "\"")
 		}
 		for akey, avalue := range n.attributes {
-			if count > 0 {
-				buffer.WriteString(",")
-			}
 			if avalue == "" {
 				continue
 			}
+			if count > 0 {
+				buffer.WriteString(",")
+			}
 			jsonValue, err := json.Marshal(avalue)
 			if err != nil {
 				return nil, err
diff --git a/wajaf.go b/wajaf.go
index 0a33c05..d663452 100644
--- a/wajaf.go
+++ b/wajaf.go
@@ -7,7 +7,7 @@
 package wajaf
 
 // VERSION is the used version nombre of the XCore library.
-const VERSION = "0.0.12"
+const VERSION = "0.0.13"
 
 // LOG is the flag to activate logging on the library.
 // if LOG is set to TRUE, LOG indicates to the XCore libraries to log a trace of functions called, with most important parameters.