--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Fri Mar 20 22:08:48 2009 -0400
+++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/VM.java	Mon Mar 23 10:42:20 2009 -0400
@@ -342,13 +342,12 @@
       throw new RuntimeException("Attempt to initialize VM twice");
     }
     soleInstance = new VM(db, debugger, debugger.getMachineDescription().isBigEndian());
-
+    debugger.putHeapConst(soleInstance.getHeapOopSize(), Universe.getNarrowOopBase(),
+                          Universe.getNarrowOopShift());
     for (Iterator iter = vmInitializedObservers.iterator(); iter.hasNext(); ) {
       ((Observer) iter.next()).update(null, null);
     }
 
-    debugger.putHeapConst(Universe.getHeapBase(), soleInstance.getHeapOopSize(),
-                        soleInstance.logMinObjAlignmentInBytes);
   }
 
   /** This is used by the debugging system */