diff --git a/src/main/java/refinedstorage/RefinedStorage.java b/src/main/java/refinedstorage/RefinedStorage.java
index cfd75a91e..581cb19dc 100755
--- a/src/main/java/refinedstorage/RefinedStorage.java
+++ b/src/main/java/refinedstorage/RefinedStorage.java
@@ -73,9 +73,7 @@ public final class RefinedStorage {
     public int speedUpgradeRfUsage;
     public int craftingUpgradeRfUsage;
     public int stackUpgradeRfUsage;
-
     public int wirelessTransmitterRangePerUpgrade;
-    public int soldererSpeedIncreasePerUpgrade;
 
     @EventHandler
     public void preInit(FMLPreInitializationEvent e) {
@@ -109,15 +107,13 @@ public final class RefinedStorage {
         controllerUsesRf = config.getBoolean("controllerUsesRf", "energy", true, "Whether the controller uses RF");
 
         wirelessTransmitterBaseRange = config.getInt("range", "wirelessTransmitter", 16, 0, Integer.MAX_VALUE, "The base range of the Wireless Transmitter");
+        wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", "wirelessTransmitter", 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter");
 
         rangeUpgradeRfUsage = config.getInt("range", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional RF/t used per Range Upgrade");
         speedUpgradeRfUsage = config.getInt("speed", "upgrades", 2, 0, Integer.MAX_VALUE, "The additional RF/t used per Speed Upgrade");
         craftingUpgradeRfUsage = config.getInt("crafting", "upgrades", 5, 0, Integer.MAX_VALUE, "The additional RF/t used per Crafting Upgrade");
         stackUpgradeRfUsage = config.getInt("stack", "upgrades", 12, 0, Integer.MAX_VALUE, "The additional RF/t used per Stack Upgrade");
 
-        wirelessTransmitterRangePerUpgrade = config.getInt("rangePerUpgrade", "upgrades", 8, 0, Integer.MAX_VALUE, "The additional range per Range Upgrade in the Wireless Transmitter");
-        soldererSpeedIncreasePerUpgrade = config.getInt("soldererSpeedIncrasePerUpgrade", "upgrades", 1, 0, Integer.MAX_VALUE, "The additional speed increase per Speed Upgrade in the Solderer");
-
         config.save();
     }
 
diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java
index 4dc826a2d..2af8239b7 100755
--- a/src/main/java/refinedstorage/tile/TileSolderer.java
+++ b/src/main/java/refinedstorage/tile/TileSolderer.java
@@ -61,7 +61,7 @@ public class TileSolderer extends TileSlave {
                     markDirty();
                 }
             } else if (working) {
-                progress += 1 + (RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED) * RefinedStorage.INSTANCE.soldererSpeedIncreasePerUpgrade);
+                progress += 1 + RefinedStorageUtils.getUpgradeCount(upgrades, ItemUpgrade.TYPE_SPEED);
 
                 if (progress >= recipe.getDuration()) {
                     if (items.getStackInSlot(3) != null) {