diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index e7d192aadd9ccf9694b62d53b39daf40ce0f0341..7734ea5749c7dafc71c5a08d779d5081f87b7495 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -42,8 +42,9 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
     protected SAMRawSession rawSession = null;
     protected SAMDatagramSession datagramSession = null;
     protected SAMStreamSession streamSession = null;
-    protected SAMDatagramSession getDatagramSession() {return datagramSession ;}	
     protected SAMRawSession getRawSession() {return rawSession ;}
+    protected SAMDatagramSession getDatagramSession() {return datagramSession ;}	
+    protected SAMStreamSession getStreamSession() {return streamSession ;}
 
     protected long _id;
     protected static volatile long __id = 0;
@@ -331,8 +332,8 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
             if (name.equals("ME")) {
                 if (getRawSession() != null) {
                     dest = getRawSession().getDestination();
-                } else if (streamSession != null) {
-                    dest = streamSession.getDestination();
+                } else if (getStreamSession() != null) {
+                    dest = getStreamSession().getDestination();
                 } else if (getDatagramSession() != null) {
                     dest = getDatagramSession().getDestination();
                 } else {
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
index f439b1253b115668b866b7c8844585b57bf3b020..b629cc09a1e75e2b98d8ca4760c54b94cfa9cf73 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
@@ -44,16 +44,18 @@ public class SAMv3Handler extends SAMv1Handler
 {
 	private final static Log _log = new Log ( SAMv3Handler.class );
 
-	protected SAMv3StreamSession streamSession = null ;
 	protected SAMv3RawSession rawSession = null ;
 	protected SAMv3DatagramSession datagramSession = null ;
+	protected SAMv3StreamSession streamSession = null ;
 	
+	protected SAMRawSession getRawSession() {
+		return rawSession ;
+	}
 	protected SAMDatagramSession getDatagramSession() {
 		return datagramSession ;
 	}
-	
-	protected SAMRawSession getRawSession() {
-		return rawSession ;
+	protected SAMStreamSession getStreamSession() {
+		return streamSession ;
 	}
 	
 	protected Session session = null ;