diff --git a/src/strategy/shaman/GenericShamanStrategy.cpp b/src/strategy/shaman/GenericShamanStrategy.cpp
index 96a31cbf..eb4958fd 100644
--- a/src/strategy/shaman/GenericShamanStrategy.cpp
+++ b/src/strategy/shaman/GenericShamanStrategy.cpp
@@ -35,7 +35,7 @@ class GenericShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionN
         {
             return new ActionNode ("flametongue weapon",
                 /*P*/ nullptr,
-                /*A*/ NextAction::array(0, new NextAction("flametongue weapon"), nullptr),
+                /*A*/ NextAction::array(0, new NextAction("rockbiter weapon"), nullptr),
                 /*C*/ nullptr);
         }
 
@@ -43,7 +43,7 @@ class GenericShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionN
         {
             return new ActionNode ("frostbrand weapon",
                 /*P*/ nullptr,
-                /*A*/ NextAction::array(0, new NextAction("frostbrand weapon"), nullptr),
+                /*A*/ NextAction::array(0, new NextAction("flametongue weapon"), nullptr),
                 /*C*/ nullptr);
         }
 
@@ -51,7 +51,7 @@ class GenericShamanStrategyActionNodeFactory : public NamedObjectFactory<ActionN
         {
             return new ActionNode ("windfury weapon",
                 /*P*/ nullptr,
-                /*A*/ NextAction::array(0, new NextAction("windfury weapon"), nullptr),
+                /*A*/ NextAction::array(0, new NextAction("flametongue weapon"), nullptr),
                 /*C*/ nullptr);
         }
 
diff --git a/src/strategy/shaman/ShamanTriggers.cpp b/src/strategy/shaman/ShamanTriggers.cpp
index d0651378..12c0e499 100644
--- a/src/strategy/shaman/ShamanTriggers.cpp
+++ b/src/strategy/shaman/ShamanTriggers.cpp
@@ -34,15 +34,15 @@ bool ShamanWeaponTrigger::IsActive()
 */
 
 bool MainHandWeaponNoImbueTrigger::IsActive() {
-    Item* const itemForSpell = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND );
+    Item* const itemForSpell = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_MAINHAND);
     if (!itemForSpell || itemForSpell->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
         return false;
     return true;
 }
 
 bool OffHandWeaponNoImbueTrigger::IsActive() {
-    Item* const itemForSpell = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND );
-    if (!itemForSpell || itemForSpell->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT))
+    Item* const itemForSpell = bot->GetItemByPos(INVENTORY_SLOT_BAG_0, EQUIPMENT_SLOT_OFFHAND);
+    if (!itemForSpell || itemForSpell->GetEnchantmentId(TEMP_ENCHANTMENT_SLOT) || itemForSpell->GetTemplate()->InventoryType != INVTYPE_WEAPON)
         return false;
     return true;
 }
@@ -106,4 +106,4 @@ bool NoAirTotemTrigger::IsActive()
 {
     return !AI_VALUE2(bool, "has totem", "wrath of air totem") &&
         !AI_VALUE2(bool, "has totem", "windfury totem");
-}
\ No newline at end of file
+}