diff --git a/crucible-wasm/src/Lang/Crucible/Wasm/Instantiate.hs b/crucible-wasm/src/Lang/Crucible/Wasm/Instantiate.hs
index 786f452ed..5c8966e0c 100644
--- a/crucible-wasm/src/Lang/Crucible/Wasm/Instantiate.hs
+++ b/crucible-wasm/src/Lang/Crucible/Wasm/Instantiate.hs
@@ -388,7 +388,11 @@ computeDataSegment ::
   Wasm.DataSegment ->
   InstM (GlobalVar WasmMem, Word32, LBS.ByteString)
 computeDataSegment i Wasm.DataSegment{ .. } =
-  do st <- lift get
+  do (memIndex, offset) <-
+       case dataMode of
+         Wasm.ActiveData memIndex offset -> pure (memIndex, offset)
+         Wasm.PassiveData -> unimplemented "Passive data segments"
+     st <- lift get
      case resolveMemIndex memIndex i of
        Nothing -> instErr ("Could not resolve memory index " <> fromString (show memIndex))
        Just (_,_,addr) ->
diff --git a/dependencies/haskell-wasm b/dependencies/haskell-wasm
index c743e11ff..32392dcc2 160000
--- a/dependencies/haskell-wasm
+++ b/dependencies/haskell-wasm
@@ -1 +1 @@
-Subproject commit c743e11ffd621c871ab98068fee4d08f21f42d14
+Subproject commit 32392dcc29ef3fef3a0e363d3c04d44f3082c881