diff --git a/src/core/org/luaj/vm/LuaState.java b/src/core/org/luaj/vm/LuaState.java
index a5bd29ea..b43078c8 100644
--- a/src/core/org/luaj/vm/LuaState.java
+++ b/src/core/org/luaj/vm/LuaState.java
@@ -639,7 +639,7 @@ public class LuaState extends Lua {
                 continue;
             }
             case LuaState.OP_SELF: {
-                rkb = GETARG_RKB(k, i);
+                rkb = stack[base + GETARG_B(i)];
                 rkc = GETARG_RKC(k, i);
                 val = this.luaV_gettable(rkb, rkc);
                 this.stack[base + a] = val;
@@ -705,7 +705,7 @@ public class LuaState extends Lua {
                 continue;
             }
             case LuaState.OP_TESTSET: {
-                rkb = GETARG_RKB(k, i);
+            	rkb = stack[base + GETARG_B(i)];
                 c = LuaState.GETARG_C(i);
                 if (rkb.toJavaBoolean() != (c != 0))
                     ci.pc++;
diff --git a/version.properties b/version.properties
index eab0bd71..3855fefd 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-version: 0.95
+version: 0.96