diff --git a/crates/fv/tests/specs.rs b/crates/fv/tests/specs.rs
index 33fb7ecfce..6190b31458 100644
--- a/crates/fv/tests/specs.rs
+++ b/crates/fv/tests/specs.rs
@@ -64,4 +64,5 @@ test_spec! { abi_address_u16_revert_1, "abi/foo.fe", "abi/address_u16_revert_1.k
 
 // storage
 test_spec! { store_u256, "storage/foo.fe", "storage/store_u256.k" }
-test_spec! { store_map, "storage/foo.fe", "storage/store_sol_map.k" }
+test_spec! { store_sol_map, "storage/foo.fe", "storage/store_sol_map.k" }
+test_spec! { store_fe_map, "storage/foo.fe", "storage/store_fe_map.k" }
diff --git a/crates/test-files/fixtures/kspecs/storage/foo.fe b/crates/test-files/fixtures/kspecs/storage/foo.fe
index 4d48aca87e..1892d9de48 100644
--- a/crates/test-files/fixtures/kspecs/storage/foo.fe
+++ b/crates/test-files/fixtures/kspecs/storage/foo.fe
@@ -10,7 +10,7 @@ contract StoreU256:
 
 
 contract StoreSolMap:
-    pub fn __call__(self):
+    pub fn __call__():
         unsafe:
             let key: u256 = evm::call_data_load(0)
             evm::mstore(0, key)
@@ -19,3 +19,12 @@ contract StoreSolMap:
             let value: u256 = evm::sload(slot)
             evm::mstore(0, value)
             evm::return_mem(0, 32)
+
+contract StoreFeMap:
+    my_map: Map<u256, u256>
+
+    pub fn __call__(self):
+        unsafe:
+            let key: u256 = evm::call_data_load(0)
+            evm::mstore(0, self.my_map[key])
+            evm::return_mem(0, 32)
diff --git a/crates/test-files/fixtures/kspecs/storage/store_fe_map.k b/crates/test-files/fixtures/kspecs/storage/store_fe_map.k
new file mode 100644
index 0000000000..c5754988f1
--- /dev/null
+++ b/crates/test-files/fixtures/kspecs/storage/store_fe_map.k
@@ -0,0 +1,109 @@
+module $TEST_NAME
+    imports VERIFICATION
+
+    claim
+
+    <kevm>
+        <k> #execute => #halt </k>
+        <exit-code> 1 </exit-code>
+        <mode> NORMAL </mode>
+        <schedule> ISTANBUL </schedule>
+
+        <ethereum>
+            <evm>
+                <output> #buf(32, VAL) </output>
+                <statusCode> _ => EVMC_SUCCESS </statusCode>
+                <endPC> _ => ?_ </endPC>
+                <callStack> _ </callStack>
+                <interimStates> _ </interimStates>
+                <touchedAccounts> _ => ?_ </touchedAccounts>
+
+                <callState>
+                    <program> #parseByteStack($StoreFeMap::RUNTIME) </program>
+                    <jumpDests> #computeValidJumpDests(#parseByteStack($StoreFeMap::RUNTIME)) </jumpDests>
+
+                    <id> ACCT_ID </id> // contract owner
+                    <caller> CALLER_ID </caller> // who called this contract; in the beginning, origin // msg.sender
+
+                    <callData> #buf(32, KEY) </callData>
+
+                    <callValue> 0 </callValue>
+                    <wordStack> .WordStack => ?_ </wordStack>
+                    <localMem> .Memory => ?_ </localMem>
+                    <pc> 0 => ?_ </pc>
+                    <gas> #gas(_VGAS) => ?_ </gas>
+                    <memoryUsed> 0 => ?_ </memoryUsed>
+                    <callGas> _ => ?_ </callGas>
+
+                    <static> false </static> // NOTE: non-static call
+                    <callDepth> CALL_DEPTH </callDepth>
+                </callState>
+
+                <substate>
+                    <selfDestruct> _ </selfDestruct>
+                    <log> _ </log>
+                    <refund> _ </refund> // TODO: more detail
+                    <accessedAccounts> _ => ?_ </accessedAccounts>
+                    <accessedStorage> _ => ?_ </accessedStorage>
+                </substate>
+
+                <gasPrice> _ </gasPrice>
+                <origin> ORIGIN_ID </origin> // who fires tx
+
+                <blockhashes> _ </blockhashes>
+                <block>
+                    <previousHash> _ </previousHash>
+                    <ommersHash> _ </ommersHash>
+                    <coinbase> _ </coinbase>
+                    <stateRoot> _ </stateRoot>
+                    <transactionsRoot> _ </transactionsRoot>
+                    <receiptsRoot> _ </receiptsRoot>
+                    <logsBloom> _ </logsBloom>
+                    <difficulty> _ </difficulty>
+                    <number> _ </number>
+                    <gasLimit> _ </gasLimit>
+                    <gasUsed> _ </gasUsed>
+                    <timestamp> _ </timestamp>
+                    <extraData> _ </extraData>
+                    <mixHash> _ </mixHash>
+                    <blockNonce> _ </blockNonce>
+                    <ommerBlockHeaders> _ </ommerBlockHeaders>
+                </block>
+            </evm>
+
+            <network>
+                <chainID> _ </chainID>
+
+                <activeAccounts> SetItem(ACCT_ID) _:Set </activeAccounts>
+
+                <accounts>
+                    <account>
+                        <acctID> ACCT_ID </acctID>
+                        <balance> _ </balance>
+                        <code> #parseByteStack($StoreFeMap::RUNTIME) </code>
+                        <storage> #hashedLocation("Fe", 0, KEY) |-> VAL _:Map </storage>
+                        <origStorage> _ </origStorage>
+                        <nonce> _ </nonce>
+                    </account>
+                </accounts>
+
+                <txOrder> _ </txOrder>
+                <txPending> _ </txPending>
+                <messages> _ </messages>
+            </network>
+        </ethereum>
+    </kevm>
+
+    requires 0 <=Int ACCT_ID    andBool ACCT_ID    <Int (2 ^Int 160)
+        andBool 0 <=Int CALLER_ID  andBool CALLER_ID  <Int (2 ^Int 160)
+        andBool 0 <=Int ORIGIN_ID  andBool ORIGIN_ID  <Int (2 ^Int 160)
+        andBool 0 <=Int CALL_DEPTH andBool CALL_DEPTH <Int 1024
+        andBool 40 <=Int KEY   andBool KEY    <Int 50
+        //andBool 0 <=Int KEY   andBool KEY    <Int (2 ^Int 256)
+        //andBool 42 ==Int KEY
+        andBool 40 <=Int VAL   andBool VAL    <Int 50
+        //andBool 0 <=Int VAL   andBool VAL    <Int (2 ^Int 256)
+        //andBool 26 ==Int VAL
+
+endmodule
+
diff --git a/crates/yulgen/src/runtime/functions/data.rs b/crates/yulgen/src/runtime/functions/data.rs
index 929f88a012..fad11e11d0 100644
--- a/crates/yulgen/src/runtime/functions/data.rs
+++ b/crates/yulgen/src/runtime/functions/data.rs
@@ -33,7 +33,7 @@ pub fn all() -> Vec<yul::Statement> {
     ]
 }
 
-/// Returns the highest available pointer.
+/// Returns the highest available pointerhttps://buy.gazelle.com/collections/ipads?_=pf&pf_v_model=iPad%20Pro%2012.9%204th%20Gen.
 pub fn avail() -> yul::Statement {
     function_definition! {
         function avail() -> ptr {
@@ -315,7 +315,7 @@ pub fn bytes_sloadn() -> yul::Statement {
         function bytes_sloadn(sptr, size) -> val {
             (let word_ptr := div(sptr, 32))
             (let bytes_offset := mod(sptr, 32))
-            (val := sloadn(word_ptr, bytes_offset, size))
+            (val := sload(word_ptr))
         }
     }
 }
@@ -354,7 +354,7 @@ pub fn map_value_ptr() -> yul::Statement {
             (mstore(ptr, a))
             (mstore((add(ptr, 32)), b))
             (let hash := keccak256(ptr, 64))
-            (return_val := set_zero(248, 256, hash))
+            (return_val := mul((div(hash, 256)), 256))
         }
     }
 }