diff --git a/src/main/java/org/fenix/utils/config/Configuration.java b/src/main/java/org/fenix/utils/config/Configuration.java
index c97eb5a..18ca99e 100644
--- a/src/main/java/org/fenix/utils/config/Configuration.java
+++ b/src/main/java/org/fenix/utils/config/Configuration.java
@@ -99,7 +99,12 @@ public class Configuration implements Serializable {
 
 			Object old = subMap.get(key);
 			subMap.put(key, value);
-			this.pcSupport.firePropertyChange(section + "." + key, old, value);
+			String propertyName;
+			if (section.length() == 0)
+				propertyName = key;
+			else
+				propertyName = section + "." + key;
+			this.pcSupport.firePropertyChange(propertyName, old, value);
 		} else {
 			throw new NullPointerException("Null key");
 		}