diff --git a/src/commands/utils/hamt-utils.ts b/src/commands/utils/hamt-utils.ts
index 90147ba5..431c283f 100644
--- a/src/commands/utils/hamt-utils.ts
+++ b/src/commands/utils/hamt-utils.ts
@@ -96,6 +96,7 @@ export const recreateInitialHamtLevel = async (links: PBLink[]): Promise<Bucket<
         }, bucket, pos)
 
         bucket._putObjectAt(pos, subBucket)
+        return
       }
 
       await bucket.put(linkName.substring(2), {
@@ -126,6 +127,7 @@ export const addLinksToHamtBucket = async (blockstore: Blockstore, links: PBLink
         bucket._putObjectAt(pos, subBucket)
 
         await addLinksToHamtBucket(blockstore, node.Links, subBucket, rootBucket, options)
+        return
       }
 
       await rootBucket.put(linkName.substring(2), {
@@ -218,7 +220,7 @@ export const generatePath = async (root: Directory, name: string, blockstore: Bl
     // found subshard
     log(`Found subshard ${segment.prefix}`)
     const block = await blockstore.get(link.Hash)
-    const node = dagPB.decode(block)
+    const node = segment.node = dagPB.decode(block)
 
     // subshard hasn't been loaded, descend to the next level of the HAMT
     if (path[i + 1] == null) {
@@ -247,8 +249,6 @@ export const generatePath = async (root: Directory, name: string, blockstore: Bl
 
     // add intermediate links to bucket
     await addLinksToHamtBucket(blockstore, node.Links, segment.bucket, rootBucket, options)
-
-    segment.node = node
   }
 
   await rootBucket.put(name, true)
diff --git a/test/rm.spec.ts b/test/rm.spec.ts
index 6052347c..e7b4cfd7 100644
--- a/test/rm.spec.ts
+++ b/test/rm.spec.ts
@@ -174,7 +174,7 @@ describe('rm', () => {
     expect(containingDirCid).to.eql(importerCid)
   })
 
-  it.skip('results in the same hash as a sharded directory created by the importer when removing a subshard', async function () {
+  it('results in the same hash as a sharded directory created by the importer when removing a subshard', async function () {
     let {
       containingDirCid,
       fileName,
@@ -195,7 +195,7 @@ describe('rm', () => {
     expect(containingDirCid).to.eql(importerCid)
   })
 
-  it.skip('results in the same hash as a sharded directory created by the importer when removing a subshard of a subshard', async function () {
+  it('results in the same hash as a sharded directory created by the importer when removing a subshard of a subshard', async function () {
     let {
       containingDirCid,
       fileName,