diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index 10d05d124..cbd6a76a7 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -27,6 +27,7 @@ import net.i2p.router.transport.TransportUtil;
 import net.i2p.stat.Rate;
 import net.i2p.stat.RateStat;
 import net.i2p.util.PortMapper;
+import net.i2p.util.SystemVersion;
 
 /**
  * Simple helper to query the appropriate router for data necessary to render
@@ -298,27 +299,32 @@ public class SummaryHelper extends HelperBase {
      */
     public String getMemory() {
         DecimalFormat integerFormatter = new DecimalFormat("###,###,##0");
-        long used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())/1024/1024;
-        long usedPc = 100 - ((Runtime.getRuntime().freeMemory() * 100) / Runtime.getRuntime().totalMemory());
-        long total = (Runtime.getRuntime().totalMemory())/1024/1024;
+        long tot = SystemVersion.getMaxMemory();
+        long free = Runtime.getRuntime().freeMemory();
+        long used = (tot - free) / (1024*1024);
+        //long usedPc = 100 - ((free * 100) / tot);
+        long total = tot / (1024*1024);
         // long free = Runtime.getRuntime().freeMemory()/1024/1024;
         // return integerFormatter.format(used) + "MB (" + usedPc + "%)";
         // return integerFormatter.format(used) + "MB / " + free + " MB";
-        return integerFormatter.format(used) + " / " + total + "MB";
+        return integerFormatter.format(used) + " / " + total + " MB";
     }
 
     /** @since 0.9.32 */
     public String getMemoryBar() {
         DecimalFormat integerFormatter = new DecimalFormat("###,###,##0");
-        long used = (Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())/1024/1024;
-        long usedPc = 100 - ((Runtime.getRuntime().freeMemory() * 100) / Runtime.getRuntime().totalMemory());
-        long total = (Runtime.getRuntime().totalMemory())/1024/1024;
+        long tot = SystemVersion.getMaxMemory();
+        long free = Runtime.getRuntime().freeMemory();
+        long used = (tot - free) / (1024*1024);
+        long usedPc = 100 - ((free * 100) / tot);
+        long total = tot / (1024*1024);
         // long free = Runtime.getRuntime().freeMemory()/1024/1024;
         // return integerFormatter.format(used) + "MB (" + usedPc + "%)";
         // return integerFormatter.format(used) + "MB / " + free + " MB";
-        return "<div class=\"percentBarOuter\" id=\"sb_memoryBar\"><div class=\"percentBarText\">RAM: " + integerFormatter.format(used) + " / " + total + "MB" +
-        "</div><div class=\"percentBarInner\" style=\"width: " + integerFormatter.format(usedPc) +
-        "%;\"></div></div>";
+        return "<div class=\"percentBarOuter\" id=\"sb_memoryBar\"><div class=\"percentBarText\">RAM: " +
+               integerFormatter.format(used) + " / " + total + " MB" +
+               "</div><div class=\"percentBarInner\" style=\"width: " + integerFormatter.format(usedPc) +
+               "%;\"></div></div>";
     }
 
     /**