diff --git a/game/modules/tome/data/general/objects/egos/staves.lua b/game/modules/tome/data/general/objects/egos/staves.lua
index 7c04f1b1d3d86d7ef51bfb38f958c64cd9f4c737..a903c08147a19a8d23041f97bc5a1d2d067b1cab 100644
--- a/game/modules/tome/data/general/objects/egos/staves.lua
+++ b/game/modules/tome/data/general/objects/egos/staves.lua
@@ -653,6 +653,11 @@ newEntity{
 	cost = 25,
 	wielder = {
 	},
+	resolvers.genericlast(function(e)
+		if e.moddable_tile:find("_hand_08_0[1-5]") then
+			e.moddable_tile = e.moddable_tile:gsub("_hand_08_0([1-5])", "_hand_08_0%1_1h")
+		end
+	end),
 }
 
 newEntity{
@@ -673,6 +678,11 @@ newEntity{
 		combat_spellcrit = resolvers.mbonus_material(2, 2),
 		combat_critical_power = resolvers.mbonus_material(7, 7),
 	},
+	resolvers.genericlast(function(e)
+		if e.moddable_tile:find("_hand_08_0[1-5]") then
+			e.moddable_tile = e.moddable_tile:gsub("_hand_08_0([1-5])", "_hand_08_0%1_1h")
+		end
+	end)
 }
 
 
diff --git a/game/modules/tome/resolvers.lua b/game/modules/tome/resolvers.lua
index 749b3d3301f199d6e77d0565ea8fec86f9c86cd7..d0deaf0d35c26e756b1fa80ab1df9f25ffdc2a16 100644
--- a/game/modules/tome/resolvers.lua
+++ b/game/modules/tome/resolvers.lua
@@ -557,7 +557,7 @@ function resolvers.calc.moddable_tile(t, e)
 		r2 = {"lower_body_03","lower_body_04","lower_body_05","lower_body_06","lower_body_06",}
 	elseif slot == "robe" then r = {"upper_body_18","upper_body_16","upper_body_13","upper_body_15","upper_body_17",}
 	elseif slot == "shield" then r = {"%s_hand_10_01","%s_hand_11_01","%s_hand_11_02","%s_hand_12_01","%s_hand_12_02",}
-	elseif slot == "staff" then r = {{"%s_hand_08",true}}
+	elseif slot == "staff" then r = {"%s_hand_08_01", "%s_hand_08_02", "%s_hand_08_03", "%s_hand_08_04", "%s_hand_08_05"}
 	elseif slot == "leather_boots" then r = {"feet_03","feet_04","feet_04","feet_05","feet_05",}
 	elseif slot == "heavy_boots" then r = {"feet_06","feet_06","feet_07","feet_09","feet_08",}
 	elseif slot == "gauntlets" then r = {"hands_03","hands_04","hands_05","hands_07","hands_06",}