diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log
index fb757792..c07d3028 100644
--- a/.vscode/dryrun.log
+++ b/.vscode/dryrun.log
@@ -1,3 +1,4 @@
+make --dry-run --always-make --keep-going --print-directory
 make: Entering directory '/home/abims/Desktop/SafeKeep'
 make: Leaving directory '/home/abims/Desktop/SafeKeep'
  
diff --git a/contracts/libraries/LibKeep.sol b/contracts/libraries/LibKeep.sol
index 0cd5ddd7..4aca926e 100644
--- a/contracts/libraries/LibKeep.sol
+++ b/contracts/libraries/LibKeep.sol
@@ -601,7 +601,8 @@ library LibKeep {
           //     vs.inheritorAllocatedERC20Tokens[msg.sender],
           //     token
           // );
-          vs.inheritorTokenShares[msg.sender][token] = 0;
+          
+          vs.inheritorAllocatedERC20Tokens[msg.sender][i];
           IERC20(token).transfer(msg.sender, amountToClaim);
           emit ERC20TokensClaimed(msg.sender, token, amountToClaim, _vaultID());
         }
@@ -629,7 +630,9 @@ library LibKeep {
             if (tokenID == 0) {
               //check for whitelist
               if (vs.whitelist[msg.sender][token]) {
+
                 vs.whitelist[msg.sender][token] = false;
+                
                 vs.inheritorAllocatedERC721TokenAddresses[msg.sender][i] = 0;
 
                 IERC721(token).transferFrom(address(this), msg.sender, 0);