diff --git a/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java b/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java
index 8d06ab53f8eb3186723c1acf32a451f49b5f4b2a..b69955e425084a48fd5a1e2190e4adaf4d90907b 100644
--- a/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java
+++ b/src/main/java/fucoin/actions/statistics/ActionInterchangeState.java
@@ -21,6 +21,10 @@ public class ActionInterchangeState extends ClientAction {
 
     @Override
     protected void onAction(ActorRef sender, ActorRef self, UntypedActorContext context, AbstractWallet abstractNode) {
+        if (abstractNode.getStatistics().getAvg() == -1) {
+            abstractNode.getStatistics().setAvg(abstractNode.getAmount());
+        }
         abstractNode.getStatistics().update(currentAmount);
+
     }
 }
diff --git a/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java b/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java
index 14daba8b02777c9a90943c92e65f585158a738c1..8324e682d520ff196440eed3cf456493d70ef22f 100644
--- a/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java
+++ b/src/main/java/fucoin/configurations/StatisticsWalletConfiguration.java
@@ -89,7 +89,7 @@ public class StatisticsWalletConfiguration extends AbstractConfiguration {
 
         numberOfInterchangeStatistic--;
         if (numberOfInterchangeStatistic == 0) {
-            createDump();
+            createSnapshot();
         } else {
             interchangeStatistic(numberOfInterchangeStatistic);
         }
@@ -98,7 +98,7 @@ public class StatisticsWalletConfiguration extends AbstractConfiguration {
     /**
      * Create a Dump of the SuperVisor and all active Wallets.
      */
-    private void createDump() {
+    private void createSnapshot() {
         superVisor.tell(new ActionCreateSuperVisorSnapshot(LocalDateTime.now()), self());
     }
 
diff --git a/src/main/java/fucoin/wallet/WalletStatistics.java b/src/main/java/fucoin/wallet/WalletStatistics.java
index 2decf8f584b15ed5bf43f790e837ba1440ad67c1..532e773a7070d98fdc7e0b65c3ff56e689aeb3a9 100644
--- a/src/main/java/fucoin/wallet/WalletStatistics.java
+++ b/src/main/java/fucoin/wallet/WalletStatistics.java
@@ -15,21 +15,14 @@ public class WalletStatistics implements Serializable {
     public WalletStatistics() {
         this.min = Integer.MAX_VALUE;
         this.max = Integer.MIN_VALUE;
-        this.avg = 0;
+        this.avg = -1;
         this.count = 0;
     }
 
-    public WalletStatistics(int min, int max, int avg, int count) {
-        this.min = min;
-        this.max = max;
-        this.avg = avg;
-        this.count = count;
-    }
-
     public void update(int currentWalletAmount) {
         setMin(currentWalletAmount);
         setMax(currentWalletAmount);
-        setAvg((getAvg() + currentWalletAmount) / 2);
+        setMax((getAvg() + currentWalletAmount) / 2);
     }
 
     public int getMin() {