diff --git a/src/resources/objects/SWGMap.java b/src/resources/objects/SWGMap.java
index 89e25a13..7c4ecda8 100644
--- a/src/resources/objects/SWGMap.java
+++ b/src/resources/objects/SWGMap.java
@@ -194,13 +194,19 @@ public class SWGMap<K, V> implements Map<K, V>, Serializable {
 				K key = entry.getKey();
 				V value = entry.getValue();
 				
-				if (valid(key) && valid(value)) {
-					if (map.containsKey(key)) {
-						if (map.put(key, value) != null) {
+				if (valid(key) && valid(value)) 
+				{
+					if (map.containsKey(key)) 
+					{
+						if (map.put(key, value) != null) 
+						{
 							buffer.add(item(2, key, Baseline.toBytes(value), true, true));
 						}
-					} else {
-						if (map.put(key, value) != null) {
+					} 
+					else 
+					{
+						if(map.put(key, value) == null)
+						{
 							buffer.add(item(0, key, Baseline.toBytes(value), true, true));
 						}
 					}