--- a/src/experiments/ProxyMethodJavaMethodInvocationNode.st	Mon Dec 26 20:52:55 2011 +0000
+++ b/src/experiments/ProxyMethodJavaMethodInvocationNode.st	Mon Dec 26 21:10:20 2011 +0000
@@ -117,11 +117,13 @@
             ^nil
         ].
 
-        invocation :=
-            MessageNode
-                receiver: (ConstantNode value: descriptor return javaClass)
+        invocation := super generate: compiler.
+        "(descriptor return javaClass isJavaWrapperClass)"true ifTrue:[
+            invocation := MessageNode
+                receiver: invocation
                 selector: #javaUnwrap:
-                arg: (super generate: compiler). 
+                arg: (super generate: compiler).
+        ].
 
         ^invocation
     ].

--- a/src/experiments/stx_libjava_experiments.st	Mon Dec 26 20:52:55 2011 +0000
+++ b/src/experiments/stx_libjava_experiments.st	Mon Dec 26 21:10:20 2011 +0000
@@ -139,10 +139,8 @@
         ProxyMethodJavaMethodInvocationNode
         ProxyMethodCompiler
         ProxyMethodJavaTypeCheckNode
-        #('Benchmarks::JavaLookup' autoload)
+        (#'Benchmarks::JavaLookup' autoload)
     )
-
-    "Modified: / 26-12-2011 / 21:50:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 extensionMethodNames
@@ -205,7 +203,7 @@
     "Return a SVN revision number of myself.
      This number is updated after a commit"
 
-    ^ "$SVN-Revision:"        '1674M'"$"
+    ^ "$SVN-Revision:"'1674'"$"
 ! !
 
 !stx_libjava_experiments class methodsFor:'documentation'!