diff --git a/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java
index a58b964..18c1bea 100644
--- a/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java
+++ b/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java
@@ -61,6 +61,6 @@ class WasmLoadStoreInstruction extends WasmLocalInstruction {
      * {@inheritDoc}
      */
     AnyType getPushValueType() {
-        return getPopCount() == 0 ? localVariables.getValueType( super.getIndex() ) : null;
+        return getPopCount() == 0 ? localVariables.getValueType( getIndex() ) : null;
     }
 }
diff --git a/src/de/inetsoftware/jwebassembly/module/WasmStructInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmStructInstruction.java
index bc86fe6..5fb919a 100644
--- a/src/de/inetsoftware/jwebassembly/module/WasmStructInstruction.java
+++ b/src/de/inetsoftware/jwebassembly/module/WasmStructInstruction.java
@@ -142,6 +142,7 @@ class WasmStructInstruction extends WasmInstruction {
             case GET:
                 return 1;
             case SET:
+                return 2;
             case NULL:
                 return 0;
             default: