diff --git a/src/main/java/ru/bclib/api/dataexchange/handler/DataExchange.java b/src/main/java/ru/bclib/api/dataexchange/handler/DataExchange.java
index d2089292..1a90b64d 100644
--- a/src/main/java/ru/bclib/api/dataexchange/handler/DataExchange.java
+++ b/src/main/java/ru/bclib/api/dataexchange/handler/DataExchange.java
@@ -59,7 +59,7 @@ abstract public class DataExchange {
         @Override
         public boolean equals(Object o) {
             if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
+            if (!(o instanceof AutoSyncID)) return false;
             AutoSyncID that = (AutoSyncID) o;
             return uniqueID.equals(that.uniqueID) && modID.equals(that.modID);
         }
diff --git a/src/main/java/ru/bclib/config/Config.java b/src/main/java/ru/bclib/config/Config.java
index 646c583e..d56c9e99 100644
--- a/src/main/java/ru/bclib/config/Config.java
+++ b/src/main/java/ru/bclib/config/Config.java
@@ -33,8 +33,9 @@ public abstract class Config {
 
 		if (autoSync) {
 			final String uid = "CONFIG_" + modID + "_" + group;
-			DataExchangeAPI.addAutoSyncFile(BCLib.MOD_ID, uid, keeper.getConfigFile());
-			autoSyncConfigs.put(new DataExchange.AutoSyncID(modID, uid), this);
+			final DataExchange.AutoSyncID aid = new DataExchange.AutoSyncID(BCLib.MOD_ID, uid);
+			DataExchangeAPI.addAutoSyncFile(aid.modID, aid.uniqueID, keeper.getConfigFile());
+			autoSyncConfigs.put(aid, this);
 		}
 	}